leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd4: fix leak on allocation error

Browse Source 
Also share some common exit code.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2011-01-31 17:14:55 -05:00
parent 22d38c4c10
commit dd239cc05f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nfsd/nfs4state.c
View File

@ -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); dp = alloc_init_deleg(sop->so_client, stp, fh, flag);
if (dp == NULL) { if (dp == NULL)
flag = NFS4_OPEN_DELEGATE_NONE; goto out_no_deleg;
goto out;
}
status = -ENOMEM; status = -ENOMEM;
fl = nfs4_alloc_init_lease(dp, flag); fl = nfs4_alloc_init_lease(dp, flag);
if (!fl) if (!fl)
goto out; goto out_free;
/* vfs_setlease checks to see if delegation should be handed out. /* vfs_setlease checks to see if delegation should be handed out.
* the lock_manager callback fl_change is used * 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); dprintk("NFSD: setlease failed [%d], no delegation\n", status);
dp->dl_flock = NULL; dp->dl_flock = NULL;
locks_free_lock(fl); locks_free_lock(fl);
unhash_delegation(dp); goto out_free;
flag = NFS4_OPEN_DELEGATE_NONE;
goto out;
} }
memcpy(&open->op_delegate_stateid, &dp->dl_stateid, sizeof(dp->dl_stateid)); 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) && open->op_delegate_type != NFS4_OPEN_DELEGATE_NONE)
dprintk("NFSD: WARNING: refusing delegation reclaim\n"); dprintk("NFSD: WARNING: refusing delegation reclaim\n");
open->op_delegate_type = flag; open->op_delegate_type = flag;
return;
out_free:
unhash_delegation(dp);
out_no_deleg:
flag = NFS4_OPEN_DELEGATE_NONE;
goto out;
} }
/* /*