Module Name: src
Committed By: riastradh
Date: Thu Apr 9 19:35:56 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
Remove some vestigial #if 0 sections.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.19
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.18 Wed Apr 9 22:41:38 2014
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Thu Apr 9 19:35:55 2015
@@ -4959,15 +4959,6 @@ zfs_netbsd_create(void *v)
KASSERT(cnp->cn_nameptr != NULL);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
vattr_init_mask(vap);
mode = vap->va_mode & ALLPERMS;
@@ -5001,15 +4992,6 @@ zfs_netbsd_remove(void *v)
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
KASSERT(VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
/*
* zfs_remove will look up the entry again itself, so discard vp.
*/
@@ -5052,15 +5034,6 @@ zfs_netbsd_mkdir(void *v)
KASSERT(cnp->cn_nameptr != NULL);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
vattr_init_mask(vap);
error = zfs_mkdir(dvp, __UNCONST(cnp->cn_nameptr), vap, vpp,
@@ -5092,15 +5065,6 @@ zfs_netbsd_rmdir(void *v)
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
KASSERT(VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
/*
* zfs_rmdir will look up the entry again itself, so discard vp.
*/
@@ -5354,15 +5318,6 @@ zfs_netbsd_symlink(void *v)
KASSERT(cnp->cn_nameptr != NULL);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
vap->va_type = VLNK; /* Netbsd: Syscall only sets va_mode. */
vattr_init_mask(vap);
@@ -5568,15 +5523,6 @@ zfs_netbsd_link(void *v)
KASSERT(cnp->cn_nameptr != NULL);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-#if 0
- /*
- * ZFS doesn't require dvp to be BSD-locked, and the caller
- * expects us to drop this lock anyway, so we might as well
- * drop it early to encourage concurrency.
- */
- VOP_UNLOCK(dvp);
-#endif
-
error = zfs_link(dvp, vp, __UNCONST(cnp->cn_nameptr), cnp->cn_cred,
NULL, 0);
@@ -5724,33 +5670,9 @@ zfs_netbsd_pathconf(void *v)
return (error);
}
-#if 1
-# define zfs_netbsd_lock genfs_lock
-# define zfs_netbsd_unlock genfs_unlock
-# define zfs_netbsd_islocked genfs_islocked
-#else
-int
-zfs_netbsd_lock(void *v)
-{
- struct vop_lock_args *ap = v;
-
- return 0;
-}
-
-int
-zfs_netbsd_unlock(void *v)
-{
-
- return 0;
-}
-
-static int
-zfs_netbsd_islocked(void *v)
-{
-
- return LK_EXCLUSIVE;
-}
-#endif
+#define zfs_netbsd_lock genfs_lock
+#define zfs_netbsd_unlock genfs_unlock
+#define zfs_netbsd_islocked genfs_islocked
/*
int
