diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-12 10:59:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-12 10:59:28 +1100 |
| commit | 148e6320fc145aaa52ca01baf9c92a5fc929286b (patch) | |
| tree | aa54aad1cf35ec350f87d7a3c50a9bef5589a4bd /fs | |
| parent | 7f094a9a988d17c8eab4b32c12712050fa859450 (diff) | |
| parent | 824d790f5082b38edc1468dd2ca70c3e13201610 (diff) | |
Merge remote branch 'nfs/linux-next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/callback_xdr.c | 1 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index db30c0b398b5..a2b8b4df125d 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -782,6 +782,7 @@ struct svc_version nfs4_callback_version1 = { .vs_proc = nfs4_callback_procedures1, .vs_xdrsize = NFS4_CALLBACK_XDRSIZE, .vs_dispatch = NULL, + .vs_hidden = 1, }; struct svc_version nfs4_callback_version4 = { diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index eda74c42d552..f9254fb0c9d0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5107,6 +5107,7 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp, res = kzalloc(sizeof(*res), GFP_KERNEL); if (!args || !res) { kfree(args); + kfree(res); nfs_put_client(clp); return -ENOMEM; } |