From e8b10b2a053cc3ab9215d9ce7687d7daf1152667 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Thu, 29 Jan 2009 11:38:28 +0000 Subject: MFC r183071: Garbage-collect vn_write_suspend_wait(). --- sys/gnu/fs/ext2fs/ext2_inode.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index 04a9d46300ce..086f73957976 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -481,7 +481,6 @@ ext2_inactive(ap) if (ip->i_mode == 0) goto out; if (ip->i_nlink <= 0) { - (void) vn_write_suspend_wait(vp, NULL, V_WAIT); error = ext2_truncate(vp, (off_t)0, 0, NOCRED, td); ip->i_rdev = 0; mode = ip->i_mode; @@ -489,15 +488,8 @@ ext2_inactive(ap) ip->i_flag |= IN_CHANGE | IN_UPDATE; ext2_vfree(vp, ip->i_number, mode); } - if (ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) { - if ((ip->i_flag & (IN_CHANGE | IN_UPDATE | IN_MODIFIED)) == 0 && - vn_write_suspend_wait(vp, NULL, V_NOWAIT)) { - ip->i_flag &= ~IN_ACCESS; - } else { - (void) vn_write_suspend_wait(vp, NULL, V_WAIT); - ext2_update(vp, 0); - } - } + if (ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) + ext2_update(vp, 0); out: /* * If we are done with the inode, reclaim it -- cgit v1.3