diff options
Diffstat (limited to 'fs/nfs/proc.c')
| -rw-r--r-- | fs/nfs/proc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index fc8de9016acf..c041c41f7a52 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
| @@ -98,7 +98,7 @@ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, | |||
| 98 | */ | 98 | */ |
| 99 | static int | 99 | static int |
| 100 | nfs_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, | 100 | nfs_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, |
| 101 | struct nfs_fattr *fattr) | 101 | struct nfs_fattr *fattr, struct nfs4_label *label) |
| 102 | { | 102 | { |
| 103 | struct rpc_message msg = { | 103 | struct rpc_message msg = { |
| 104 | .rpc_proc = &nfs_procedures[NFSPROC_GETATTR], | 104 | .rpc_proc = &nfs_procedures[NFSPROC_GETATTR], |
| @@ -146,7 +146,8 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, | |||
| 146 | 146 | ||
| 147 | static int | 147 | static int |
| 148 | nfs_proc_lookup(struct inode *dir, struct qstr *name, | 148 | nfs_proc_lookup(struct inode *dir, struct qstr *name, |
| 149 | struct nfs_fh *fhandle, struct nfs_fattr *fattr) | 149 | struct nfs_fh *fhandle, struct nfs_fattr *fattr, |
| 150 | struct nfs4_label *label) | ||
| 150 | { | 151 | { |
| 151 | struct nfs_diropargs arg = { | 152 | struct nfs_diropargs arg = { |
| 152 | .fh = NFS_FH(dir), | 153 | .fh = NFS_FH(dir), |
| @@ -243,7 +244,7 @@ nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
| 243 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); | 244 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); |
| 244 | nfs_mark_for_revalidate(dir); | 245 | nfs_mark_for_revalidate(dir); |
| 245 | if (status == 0) | 246 | if (status == 0) |
| 246 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr); | 247 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); |
| 247 | nfs_free_createdata(data); | 248 | nfs_free_createdata(data); |
| 248 | out: | 249 | out: |
| 249 | dprintk("NFS reply create: %d\n", status); | 250 | dprintk("NFS reply create: %d\n", status); |
| @@ -290,7 +291,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
| 290 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); | 291 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); |
| 291 | } | 292 | } |
| 292 | if (status == 0) | 293 | if (status == 0) |
| 293 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr); | 294 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); |
| 294 | nfs_free_createdata(data); | 295 | nfs_free_createdata(data); |
| 295 | out: | 296 | out: |
| 296 | dprintk("NFS reply mknod: %d\n", status); | 297 | dprintk("NFS reply mknod: %d\n", status); |
| @@ -442,7 +443,7 @@ nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, | |||
| 442 | * should fill in the data with a LOOKUP call on the wire. | 443 | * should fill in the data with a LOOKUP call on the wire. |
| 443 | */ | 444 | */ |
| 444 | if (status == 0) | 445 | if (status == 0) |
| 445 | status = nfs_instantiate(dentry, fh, fattr); | 446 | status = nfs_instantiate(dentry, fh, fattr, NULL); |
| 446 | 447 | ||
| 447 | out_free: | 448 | out_free: |
| 448 | nfs_free_fattr(fattr); | 449 | nfs_free_fattr(fattr); |
| @@ -471,7 +472,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) | |||
| 471 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); | 472 | status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); |
| 472 | nfs_mark_for_revalidate(dir); | 473 | nfs_mark_for_revalidate(dir); |
| 473 | if (status == 0) | 474 | if (status == 0) |
| 474 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr); | 475 | status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL); |
| 475 | nfs_free_createdata(data); | 476 | nfs_free_createdata(data); |
| 476 | out: | 477 | out: |
| 477 | dprintk("NFS reply mkdir: %d\n", status); | 478 | dprintk("NFS reply mkdir: %d\n", status); |
