diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-12-13 09:11:39 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-01-07 13:38:21 -0500 |
| commit | 94ae1db226a5bcbb48372d81161f084c9e283fd8 (patch) | |
| tree | 696ef809d14d51b48112195e06dbf7bd599807c4 /fs/nfsd | |
| parent | b1940cd21c0f4abdce101253e860feff547291b0 (diff) | |
| download | op-kernel-dev-94ae1db226a5bcbb48372d81161f084c9e283fd8.zip op-kernel-dev-94ae1db226a5bcbb48372d81161f084c9e283fd8.tar.gz | |
nfsd: fix fi_delegees leak when fi_had_conflict returns true
Currently, nfs4_set_delegation takes a reference to an existing
delegation and then checks to see if there is a conflict. If there is
one, then it doesn't release that reference.
Change the code to take the reference after the check and only if there
is no conflict.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3550a9c..c06a1ba 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3897,11 +3897,11 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh, status = nfs4_setlease(dp); goto out; } - atomic_inc(&fp->fi_delegees); if (fp->fi_had_conflict) { status = -EAGAIN; goto out_unlock; } + atomic_inc(&fp->fi_delegees); hash_delegation_locked(dp, fp); status = 0; out_unlock: |
