diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
| commit | bd0f725c4c0bd77b6d931f63eda2d51423a22d43 (patch) | |
| tree | 95caf3ce41ef7d73eae1972ad04b230cdeed6340 /include/linux/nfs_xdr.h | |
| parent | 2ca310fc4160ed0420da65534a21ae77b24326a8 (diff) | |
| parent | fdb63dcdb53a3c6dc11d4e438ef2425ec962d1e9 (diff) | |
| download | blackbird-op-linux-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.tar.gz blackbird-op-linux-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.zip | |
Merge branch 'devel' into linux-next
Diffstat (limited to 'include/linux/nfs_xdr.h')
| -rw-r--r-- | include/linux/nfs_xdr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 5624e4e2763c..6fb5b2335b59 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1402,6 +1402,7 @@ struct nfs_renamedata { struct inode *new_dir; struct dentry *new_dentry; struct nfs_fattr new_fattr; + void (*complete)(struct rpc_task *, struct nfs_renamedata *); }; struct nfs_access_entry; @@ -1444,8 +1445,6 @@ struct nfs_rpc_ops { void (*unlink_setup) (struct rpc_message *, struct inode *dir); void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *); int (*unlink_done) (struct rpc_task *, struct inode *); - int (*rename) (struct inode *, struct qstr *, - struct inode *, struct qstr *); void (*rename_setup) (struct rpc_message *msg, struct inode *dir); void (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *); int (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir); |
