aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-14 15:39:57 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-19 15:21:39 -0400
commit4fdc17b2a7f4d9db5b08e0f963d0027f714e4104 (patch)
tree502aacc94e06962c2f3352b6ced1146245158be1 /fs/nfs/proc.c
parent3062c532ad410fe0e8320566fe2879a396be6701 (diff)
NFS: Introduce struct nfs_removeargs+nfs_removeres
We need a common structure for setting up an unlink() rpc call in order to fix the asynchronous unlink code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/proc.c')
-rw-r--r--fs/nfs/proc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 7be0ee2782cb..3b3eb692e0f4 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -272,14 +272,14 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
272static int 272static int
273nfs_proc_remove(struct inode *dir, struct qstr *name) 273nfs_proc_remove(struct inode *dir, struct qstr *name)
274{ 274{
275 struct nfs_diropargs arg = { 275 struct nfs_removeargs arg = {
276 .fh = NFS_FH(dir), 276 .fh = NFS_FH(dir),
277 .name = name->name, 277 .name.len = name->len,
278 .len = name->len 278 .name.name = name->name,
279 }; 279 };
280 struct rpc_message msg = { 280 struct rpc_message msg = {
281 .rpc_proc = &nfs_procedures[NFSPROC_REMOVE], 281 .rpc_proc = &nfs_procedures[NFSPROC_REMOVE],
282 .rpc_argp = &arg, 282 .rpc_argp = &arg,
283 }; 283 };
284 int status; 284 int status;
285 285
@@ -294,14 +294,14 @@ nfs_proc_remove(struct inode *dir, struct qstr *name)
294static int 294static int
295nfs_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *name) 295nfs_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *name)
296{ 296{
297 struct nfs_diropargs *arg; 297 struct nfs_removeargs *arg;
298 298
299 arg = kmalloc(sizeof(*arg), GFP_KERNEL); 299 arg = kmalloc(sizeof(*arg), GFP_KERNEL);
300 if (!arg) 300 if (!arg)
301 return -ENOMEM; 301 return -ENOMEM;
302 arg->fh = NFS_FH(dir->d_inode); 302 arg->fh = NFS_FH(dir->d_inode);
303 arg->name = name->name; 303 arg->name.name = name->name;
304 arg->len = name->len; 304 arg->name.len = name->len;
305 msg->rpc_proc = &nfs_procedures[NFSPROC_REMOVE]; 305 msg->rpc_proc = &nfs_procedures[NFSPROC_REMOVE];
306 msg->rpc_argp = arg; 306 msg->rpc_argp = arg;
307 return 0; 307 return 0;