Module Name:    src
Committed By:   pooka
Date:           Sat Sep  1 16:19:01 UTC 2012

Modified Files:
        src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c

Log Message:
For now, make vop_islocked more like vop_lock and vop_unlock (i.e. don't
even attempt to do anything).


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    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.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.10
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.9	Sun Nov 20 02:54:25 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c	Sat Sep  1 16:19:00 2012
@@ -5439,6 +5439,14 @@ zfs_netbsd_unlock(void *v)
 
 	return 0;
 }
+
+static int
+zfs_netbsd_islocked(void *v)
+{
+
+	return LK_EXCLUSIVE;
+}
+
 /*
 int
 zfs_netbsd_getpages(void *v)
@@ -5485,7 +5493,6 @@ zfs_netbsd_putpages(void *v)
 #define zfs_netbsd_mmap genfs_mmap
 #define zfs_netbsd_getpages genfs_compat_getpages
 //#define zfs_netbsd_putpages genfs_putpages
-#define zfs_netbsd_islocked genfs_islocked
 
 int (**zfs_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc zfs_vnodeop_entries[] = {

Reply via email to