aboutsummaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorJeff Roberson <jeff@FreeBSD.org>2005-03-17 11:58:43 +0000
committerJeff Roberson <jeff@FreeBSD.org>2005-03-17 11:58:43 +0000
commit23d15e852d9025a0ee021e6f7786a97ec745e8ff (patch)
treebdb04f8e86b68b355c6026836e722568807f76c0 /sys/ufs
parent7e89b50216c745d29ca94a4bd5502c45befc749b (diff)
downloadsrc-23d15e852d9025a0ee021e6f7786a97ec745e8ff.tar.gz
src-23d15e852d9025a0ee021e6f7786a97ec745e8ff.zip
- Lock the clearing of v_data in ufs_reclaim() to prevent a pagefault
in ffs_lock() when it acesses v_data without the vnlock. Sponsored by: Isilon Systems, Inc.
Notes
Notes: svn path=/head/; revision=143743
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ufs/ufs_inode.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index b674c944b7b3..72a10f19077b 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -174,7 +174,13 @@ ufs_reclaim(ap)
if (ip->i_dirhash != NULL)
ufsdirhash_free(ip);
#endif
- UFS_IFREE(ump, ip);
+ /*
+ * Lock the clearing of v_data so ffs_lock() can inspect it
+ * prior to obtaining the lock.
+ */
+ VI_LOCK(vp);
vp->v_data = 0;
+ VI_UNLOCK(vp);
+ UFS_IFREE(ump, ip);
return (0);
}