diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
| commit | f85a6597a6ce33fe4f390744b2764b30aa7bfda8 (patch) | |
| tree | 9b923afc20e7d3a7e78f98d600fd7e6633b4265b /fs/nfs/nfs4proc.c | |
| parent | ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus (diff) | |
| download | linux-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.tar.xz linux-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.zip | |
Merge tag 'asoc-v3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A few driver specific fixes here plus one core fix for a memory
corruption issue in DAPM initialisation which could lead to crashes.
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index cf11799297c4..108a774095f7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3071,15 +3071,13 @@ struct rpc_clnt * nfs4_proc_lookup_mountpoint(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { + struct rpc_clnt *client = NFS_CLIENT(dir); int status; - struct rpc_clnt *client = rpc_clone_client(NFS_CLIENT(dir)); status = nfs4_proc_lookup_common(&client, dir, name, fhandle, fattr, NULL); - if (status < 0) { - rpc_shutdown_client(client); + if (status < 0) return ERR_PTR(status); - } - return client; + return (client == NFS_CLIENT(dir)) ? rpc_clone_client(client) : client; } static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) |