Commit 6ce96917 authored Oct 17, 2005 by Trond Myklebust Committed by Linus Torvalds Oct 17, 2005

[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>

parent b3c52da3

fs/nfs/inode.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}