PERFORCE change 168778 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Sep 22 15:57:49 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=168778
Change 168778 by trasz at trasz_victim on 2009/09/22 15:57:19
Fix mismerges.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#52 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#35 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#9 (text+ko) ====
@@ -209,7 +209,6 @@
.Xr acl 3 ,
.Xr vaccess_acl_nfs4 9 ,
.Xr vaccess_acl_posix1e 9 ,
-.Xr vaccess_acl_nfs4 9 ,
.Xr VFS 9 ,
.Xr vnaccess 9 ,
.Xr VOP_ACLCHECK 9 ,
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#5 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vaccess_acl_nfs4.9,v 1.1 2009/09/22 15:15:03 trasz Exp $
.\"
-.Dd August 22, 2001
+.Dd September 18, 2009
.Os
.Dt VACCESS_ACL_NFS4 9
.Sh NAME
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 (text+ko) ====
@@ -2354,9 +2354,6 @@
if (error == 0) {
int resume_err;
-#ifdef FREEBSD_NAMECACHE
- cache_purgevfs(zfsvfs->z_vfs);
-#endif
ASSERT(strcmp(osname, zc->zc_name) == 0);
error = dmu_objset_rollback(os);
resume_err = zfs_resume_fs(zfsvfs, osname, mode);
@@ -2543,9 +2540,6 @@
if (error == 0) {
int resume_err;
-#ifdef FREEBSD_NAMECACHE
- cache_purgevfs(zfsvfs->z_vfs);
-#endif
error = dmu_recv_end(&drc);
resume_err = zfs_resume_fs(zfsvfs, osname, mode);
error = error ? error : resume_err;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#52 (text+ko) ====
@@ -2011,7 +2011,6 @@
compile-with "${NORMAL_C:N-fstack-protector*}"
kern/subr_acl_nfs4.c standard
kern/subr_acl_posix1e.c standard
-kern/subr_acl_nfs4.c standard
kern/subr_autoconf.c standard
kern/subr_blist.c standard
kern/subr_bus.c standard
==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#35 (text+ko) ====
@@ -620,9 +620,6 @@
int vaccess_acl_posix1e(enum vtype type, uid_t file_uid,
gid_t file_gid, struct acl *acl, accmode_t accmode,
struct ucred *cred, int *privused);
-int vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid,
- struct acl *aclp, accmode_t accmode, struct ucred *cred,
- int *privused);
void vattr_null(struct vattr *vap);
int vcount(struct vnode *vp);
void vdrop(struct vnode *);
More information about the p4-projects
mailing list