From owner-p4-projects@FreeBSD.ORG Mon Jun 30 20:09:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6778B1065675; Mon, 30 Jun 2008 20:09:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28C03106564A for ; Mon, 30 Jun 2008 20:09:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1798C8FC19 for ; Mon, 30 Jun 2008 20:09:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5UK9oMi031322 for ; Mon, 30 Jun 2008 20:09:50 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5UK9o0H031320 for perforce@freebsd.org; Mon, 30 Jun 2008 20:09:50 GMT (envelope-from trasz@freebsd.org) Date: Mon, 30 Jun 2008 20:09:50 GMT Message-Id: <200806302009.m5UK9o0H031320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2008 20:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=144383 Change 144383 by trasz@trasz_traszkan on 2008/06/30 20:09:40 Remove last parts of old cruft. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/acl.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#5 (text+ko) ==== @@ -114,28 +114,6 @@ #define ACL_UNDEFINED_ID ((uid_t)-1) -#define ACE_ACE_ADD_SUBDIRECTORY 0x00000004 -#define ACE_READ_NAMED_ATTRS 0x00000008 -#define ACE_WRITE_NAMED_ATTRS 0x00000010 -#define ACE_EXECUTE 0x00000020 -#define ACE_DELETE_CHILD 0x00000040 -#define ACE_READ_ATTRIBUTES 0x00000080 -#define ACE_WRITE_ATTRIBUTES 0x00000100 -#define ACE_DELETE 0x00010000 -#define ACE_READ_ACL 0x00020000 -#define ACE_WRITE_ACL 0x00040000 -#define ACE_WRITE_OWNER 0x00080000 -#define ACE_SYNCHRONIZE 0x00100000 - -/* - * Possible values for _cmd parameter for acl(2)/facl(2). - */ -#define ACE_SETACL 1 -#define ACE_GETACL 2 -#define ACE_GETACLCNT 3 - -#endif /* !_SOLARIS_C_SOURCE */ - #ifdef _KERNEL extern uma_zone_t acl_zone; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/acl.h#3 (text+ko) ==== @@ -44,13 +44,6 @@ int ufs_setacl(struct vop_setacl_args *); int ufs_aclcheck(struct vop_aclcheck_args *); -int ufs_load_acecnt(struct vnode *vp, int *nentries, struct thread *td); -int ufs_nfs4acl_from_inode(struct vop_getace_args *ap); -void ufs_sync_inode_from_nfs4acl(ace_t *aclp, int nentries, struct inode *ip); -int ufs_getace(struct vop_getace_args *ap); -int ufs_getacecnt(struct vop_getacecnt_args *ap); -int ufs_setace(struct vop_setace_args *ap); - #endif /* !_KERNEL */ #endif /* !_UFS_UFS_ACL_H_ */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#3 (text+ko) ==== @@ -2474,9 +2474,6 @@ .vop_setacl = ufs_setacl, .vop_aclcheck = ufs_aclcheck, #endif - .vop_getace = ufs_getace, - .vop_setace = ufs_setace, - .vop_getacecnt = ufs_getacecnt, }; struct vop_vector ufs_fifoops = { @@ -2505,7 +2502,4 @@ .vop_setacl = ufs_setacl, .vop_aclcheck = ufs_aclcheck, #endif - .vop_getace = ufs_getace, - .vop_setace = ufs_setace, - .vop_getacecnt = ufs_getacecnt, };