diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-01-31 17:14:55 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-02-14 10:35:18 -0500 |
| commit | dd239cc05f0ad9f582dd83d88a4fb5edcc57a026 (patch) | |
| tree | ea1a50af9405d104d5c98620eed4ca10bf131df6 /fs/nfsd | |
| parent | 22d38c4c10e8344aa406897d99a35d585d2cb77d (diff) | |
| download | op-kernel-dev-dd239cc05f0ad9f582dd83d88a4fb5edcc57a026.zip op-kernel-dev-dd239cc05f0ad9f582dd83d88a4fb5edcc57a026.tar.gz | |
nfsd4: fix leak on allocation error
Also share some common exit code.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 65978a9..099d6fa 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2699,14 +2699,12 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta } dp = alloc_init_deleg(sop->so_client, stp, fh, flag); - if (dp == NULL) { - flag = NFS4_OPEN_DELEGATE_NONE; - goto out; - } + if (dp == NULL) + goto out_no_deleg; status = -ENOMEM; fl = nfs4_alloc_init_lease(dp, flag); if (!fl) - goto out; + goto out_free; /* vfs_setlease checks to see if delegation should be handed out. * the lock_manager callback fl_change is used */ @@ -2714,9 +2712,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta dprintk("NFSD: setlease failed [%d], no delegation\n", status); dp->dl_flock = NULL; locks_free_lock(fl); - unhash_delegation(dp); - flag = NFS4_OPEN_DELEGATE_NONE; - goto out; + goto out_free; } memcpy(&open->op_delegate_stateid, &dp->dl_stateid, sizeof(dp->dl_stateid)); @@ -2729,6 +2725,12 @@ out: && open->op_delegate_type != NFS4_OPEN_DELEGATE_NONE) dprintk("NFSD: WARNING: refusing delegation reclaim\n"); open->op_delegate_type = flag; + return; +out_free: + unhash_delegation(dp); +out_no_deleg: + flag = NFS4_OPEN_DELEGATE_NONE; + goto out; } /* |
