diff options
Diffstat (limited to 'fs/nfs/nfs3proc.c')
-rw-r--r-- | fs/nfs/nfs3proc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 6dc4ef66f074..bb41d88e1567 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -448,7 +448,7 @@ nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name, | |||
448 | .new_dir = NFS_FH(new_dir), | 448 | .new_dir = NFS_FH(new_dir), |
449 | .new_name = new_name, | 449 | .new_name = new_name, |
450 | }; | 450 | }; |
451 | struct nfs3_renameres res; | 451 | struct nfs_renameres res; |
452 | struct rpc_message msg = { | 452 | struct rpc_message msg = { |
453 | .rpc_proc = &nfs3_procedures[NFS3PROC_RENAME], | 453 | .rpc_proc = &nfs3_procedures[NFS3PROC_RENAME], |
454 | .rpc_argp = &arg, | 454 | .rpc_argp = &arg, |
@@ -458,17 +458,17 @@ nfs3_proc_rename(struct inode *old_dir, struct qstr *old_name, | |||
458 | 458 | ||
459 | dprintk("NFS call rename %s -> %s\n", old_name->name, new_name->name); | 459 | dprintk("NFS call rename %s -> %s\n", old_name->name, new_name->name); |
460 | 460 | ||
461 | res.fromattr = nfs_alloc_fattr(); | 461 | res.old_fattr = nfs_alloc_fattr(); |
462 | res.toattr = nfs_alloc_fattr(); | 462 | res.new_fattr = nfs_alloc_fattr(); |
463 | if (res.fromattr == NULL || res.toattr == NULL) | 463 | if (res.old_fattr == NULL || res.new_fattr == NULL) |
464 | goto out; | 464 | goto out; |
465 | 465 | ||
466 | status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0); | 466 | status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0); |
467 | nfs_post_op_update_inode(old_dir, res.fromattr); | 467 | nfs_post_op_update_inode(old_dir, res.old_fattr); |
468 | nfs_post_op_update_inode(new_dir, res.toattr); | 468 | nfs_post_op_update_inode(new_dir, res.new_fattr); |
469 | out: | 469 | out: |
470 | nfs_free_fattr(res.toattr); | 470 | nfs_free_fattr(res.old_fattr); |
471 | nfs_free_fattr(res.fromattr); | 471 | nfs_free_fattr(res.new_fattr); |
472 | dprintk("NFS reply rename: %d\n", status); | 472 | dprintk("NFS reply rename: %d\n", status); |
473 | return status; | 473 | return status; |
474 | } | 474 | } |