diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /fs/nfs/nfs4proc.c | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 285ad5334018..4bf3d97cc5a0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -3247,7 +3247,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir, | |||
| 3247 | err = -EPERM; | 3247 | err = -EPERM; |
| 3248 | if (client != *clnt) | 3248 | if (client != *clnt) |
| 3249 | goto out; | 3249 | goto out; |
| 3250 | client = nfs4_create_sec_client(client, dir, name); | 3250 | client = nfs4_negotiate_security(client, dir, name); |
| 3251 | if (IS_ERR(client)) | 3251 | if (IS_ERR(client)) |
| 3252 | return PTR_ERR(client); | 3252 | return PTR_ERR(client); |
| 3253 | 3253 | ||