git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
fs
/
nfs
/
nfs3proc.c
diff --git
a/fs/nfs/nfs3proc.c
b/fs/nfs/nfs3proc.c
index
d0c80d8
..
38053d8
100644
(file)
--- a/
fs/nfs/nfs3proc.c
+++ b/
fs/nfs/nfs3proc.c
@@
-141,7
+141,7
@@
nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
}
static int
-nfs3_proc_lookup(struct inode *dir, struct qstr *name,
+nfs3_proc_lookup(struct
rpc_clnt *clnt, struct
inode *dir, struct qstr *name,
struct nfs_fh *fhandle, struct nfs_fattr *fattr)
{
struct nfs3_diropargs arg = {