diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-26 12:54:46 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:22 +0100 |
| commit | 947126be298fd9c3726911714cc796e863431b80 (patch) | |
| tree | f223ca7a4ba8d7ef28436899145ed0a4598e8bc8 /fs | |
| parent | db92697414a6e91bb5c467a02665e7bf91033fd5 (diff) | |
| download | kernel_samsung_smdk4412-947126be298fd9c3726911714cc796e863431b80.zip kernel_samsung_smdk4412-947126be298fd9c3726911714cc796e863431b80.tar.gz kernel_samsung_smdk4412-947126be298fd9c3726911714cc796e863431b80.tar.bz2 | |
NFSv4: Don't call put_rpccred() under the rcu_read_lock()
commit 7c0af9ffb7bb4e5355470fa60b3eb711ddf226fa upstream.
put_rpccred() can sleep.
Fixes: 8f649c3762547 ("NFSv4: Fix the locking in nfs_inode_reclaim_delegation()")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index ac889af..92cf07d 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -149,8 +149,8 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, &delegation->flags); NFS_I(inode)->delegation_state = delegation->type; spin_unlock(&delegation->lock); - put_rpccred(oldcred); rcu_read_unlock(); + put_rpccred(oldcred); } else { /* We appear to have raced with a delegation return. */ spin_unlock(&delegation->lock); |