summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-02-26 12:54:46 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-03-01 23:23:07 -0500
commit7c0af9ffb7bb4e5355470fa60b3eb711ddf226fa (patch)
tree6e12ecf6d6d08452230ea857d421c5529b5639d1 /fs
parentfa9233699cc1dc236f4cf42245d13e40966938c5 (diff)
downloadop-kernel-dev-7c0af9ffb7bb4e5355470fa60b3eb711ddf226fa.zip
op-kernel-dev-7c0af9ffb7bb4e5355470fa60b3eb711ddf226fa.tar.gz
NFSv4: Don't call put_rpccred() under the rcu_read_lock()
put_rpccred() can sleep. Fixes: 8f649c3762547 ("NFSv4: Fix the locking in nfs_inode_reclaim_delegation()") Cc: stable@vger.kernel.org # 2.6.35+ Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/delegation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index a1f0685..2e37d83 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -181,8 +181,8 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred,
clear_bit(NFS_DELEGATION_NEED_RECLAIM,
&delegation->flags);
spin_unlock(&delegation->lock);
- put_rpccred(oldcred);
rcu_read_unlock();
+ put_rpccred(oldcred);
trace_nfs4_reclaim_delegation(inode, res->delegation_type);
} else {
/* We appear to have raced with a delegation return. */
OpenPOWER on IntegriCloud