From: Trond Myklebust <trond.myklebust@fys.uio.no>
Date: Mon, 17 Oct 2005 10:03:23 +0000 (-0400)
Subject: [PATCH] NFS: Fix Oopsable/unnecessary i_count manipulations in nfs_wait_on_inode()
X-Git-Tag: v2.6.14-rc5~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6ce969171d5187f7621be68c0ebbc7fb02ec53f1;p=linux-2.6-omap-h63xx.git

[PATCH] NFS: Fix Oopsable/unnecessary i_count manipulations in nfs_wait_on_inode()

Oopsable since nfs_wait_on_inode() can get called as part of iput_final().

Unnecessary since the caller had better be damned sure that the inode won't
disappear from underneath it anyway.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 6be46d21c01..d4eadeea128 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -877,12 +877,10 @@ static int nfs_wait_on_inode(struct inode *inode)
 	sigset_t oldmask;
 	int error;
 
-	atomic_inc(&inode->i_count);
 	rpc_clnt_sigmask(clnt, &oldmask);
 	error = wait_on_bit_lock(&nfsi->flags, NFS_INO_REVALIDATING,
 					nfs_wait_schedule, TASK_INTERRUPTIBLE);
 	rpc_clnt_sigunmask(clnt, &oldmask);
-	iput(inode);
 
 	return error;
 }