summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/fs
diff options
context:
space:
mode:
authorbatschul <none@none>2005-09-17 09:54:49 -0700
committerbatschul <none@none>2005-09-17 09:54:49 -0700
commitd5dbd18d69de8954ab5ceb588e99d43fc9b21d46 (patch)
tree2f609bebd6259757c3c5296f372cc6963cd70068 /usr/src/uts/intel/fs
parent264d6c47155e48a72de1c618998b22b3057c0de1 (diff)
downloadillumos-joyent-d5dbd18d69de8954ab5ceb588e99d43fc9b21d46.tar.gz
PSARC 2005/287 obsolete and remove vn_vfslock interface
6265230 retire usage of deprecated vn_vfslock() interface from ON
Diffstat (limited to 'usr/src/uts/intel/fs')
-rw-r--r--usr/src/uts/intel/fs/xmemfs/xmem_dir.c6
-rw-r--r--usr/src/uts/intel/fs/xmemfs/xmem_vnops.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_dir.c b/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
index 2a9e389412..a0ccd4c92b 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
+++ b/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -726,10 +726,10 @@ xdirrename(
goto out;
}
/*
- * vn_vfslock will prevent mounts from using the directory
+ * vn_vfswlock will prevent mounts from using the directory
* until we are done.
*/
- if (vn_vfslock(XNTOV(to))) {
+ if (vn_vfswlock(XNTOV(to))) {
error = EBUSY;
goto out;
}
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c b/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
index f6a109c11f..de6f99f6cb 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
+++ b/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
@@ -1100,7 +1100,7 @@ xmem_rmdir(struct vnode *dvp, char *nm, struct vnode *cdir, struct cred *cred)
}
mutex_exit(&self->xn_tlock);
- if (vn_vfslock(vp)) {
+ if (vn_vfswlock(vp)) {
error = EBUSY;
goto done1;
}