diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-27 14:55:39 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-28 13:37:09 -0500 |
| commit | e00b8a24041f37e56b4b8415ce4eba1cbc238065 (patch) | |
| tree | eb4fbb050e1d4afdd6d10b4b420420fa92ad92a8 /fs | |
| parent | c7a360b05b5430ac1d75dc7d53c586ada60a05cb (diff) | |
| download | linux-e00b8a24041f37e56b4b8415ce4eba1cbc238065.tar.gz linux-e00b8a24041f37e56b4b8415ce4eba1cbc238065.tar.bz2 linux-e00b8a24041f37e56b4b8415ce4eba1cbc238065.zip | |
NFS: Fix an NFS client lockdep issue
There is no reason to be freeing the delegation cred in the rcu callback,
and doing so is resulting in a lockdep complaint that rpc_credcache_lock
is being called from both softirq and non-softirq contexts.
Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/delegation.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 364e4328f392..bbbc6bf5cb2e 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -23,8 +23,6 @@ static void nfs_do_free_delegation(struct nfs_delegation *delegation) { - if (delegation->cred) - put_rpccred(delegation->cred); kfree(delegation); } @@ -37,6 +35,10 @@ static void nfs_free_delegation_callback(struct rcu_head *head) static void nfs_free_delegation(struct nfs_delegation *delegation) { + if (delegation->cred) { + put_rpccred(delegation->cred); + delegation->cred = NULL; + } call_rcu(&delegation->rcu, nfs_free_delegation_callback); } |