diff options
author | 2010-04-29 10:23:44 -0700 | |
---|---|---|
committer | 2010-04-29 10:23:44 -0700 | |
commit | 27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 (patch) | |
tree | 25a8ca59a3743459bbd48674731becea89a16318 /fs/nfs/nfs4proc.c | |
parent | pktcdvd: improve BKL and compat_ioctl.c usage (diff) | |
parent | nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4 (diff) | |
download | linux-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.tar.gz linux-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.tar.bz2 linux-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.zip |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4
nfs: fix some issues in nfs41_proc_reclaim_complete()
NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear
NFS: Fix an unstable write data integrity race
nfs: testing for null instead of ERR_PTR()
NFS: rsize and wsize settings ignored on v4 mounts
NFSv4: Don't attempt an atomic open if the file is a mountpoint
SUNRPC: Fix a bug in rpcauth_prune_expired
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 638067007c65..071fcedd517c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5218,9 +5218,12 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp) msg.rpc_resp = &calldata->res; task_setup_data.callback_data = calldata; task = rpc_run_task(&task_setup_data); - if (IS_ERR(task)) + if (IS_ERR(task)) { status = PTR_ERR(task); + goto out; + } rpc_put_task(task); + return 0; out: dprintk("<-- %s status=%d\n", __func__, status); return status; |