projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
[cascardo/linux.git]
/
fs
/
nfs
/
nfs4proc.c
diff --git
a/fs/nfs/nfs4proc.c
b/fs/nfs/nfs4proc.c
index
285ad53
..
4bf3d97
100644
(file)
--- 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,
err = -EPERM;
if (client != *clnt)
goto out;
- client = nfs4_
create_sec_client
(client, dir, name);
+ client = nfs4_
negotiate_security
(client, dir, name);
if (IS_ERR(client))
return PTR_ERR(client);