aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfs_xdr.h
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-03-19 14:54:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-21 09:31:46 -0400
commit34e137cc7e3b63c254875e59cd48dcbe6757fe6c (patch)
treeea509e7f715bcbf2fd3541062063348f547e6c6c /include/linux/nfs_xdr.h
parentea7c330362257c072791aeaf03bae2cebf9fb984 (diff)
NFS: Remove nfs4_setup_sequence from generic unlink code
This is an NFS v4 specific operation, so it belongs in the NFS v4 code and not the generic client. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_xdr.h')
-rw-r--r--include/linux/nfs_xdr.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 286d74dde053..8d93e688188d 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1192,6 +1192,15 @@ struct nfs_write_data {
1192 struct page *page_array[NFS_PAGEVEC_SIZE]; 1192 struct page *page_array[NFS_PAGEVEC_SIZE];
1193}; 1193};
1194 1194
1195struct nfs_unlinkdata {
1196 struct hlist_node list;
1197 struct nfs_removeargs args;
1198 struct nfs_removeres res;
1199 struct inode *dir;
1200 struct rpc_cred *cred;
1201 struct nfs_fattr dir_attr;
1202};
1203
1195struct nfs_access_entry; 1204struct nfs_access_entry;
1196struct nfs_client; 1205struct nfs_client;
1197struct rpc_timeout; 1206struct rpc_timeout;
@@ -1221,6 +1230,7 @@ struct nfs_rpc_ops {
1221 struct iattr *, int, struct nfs_open_context *); 1230 struct iattr *, int, struct nfs_open_context *);
1222 int (*remove) (struct inode *, struct qstr *); 1231 int (*remove) (struct inode *, struct qstr *);
1223 void (*unlink_setup) (struct rpc_message *, struct inode *dir); 1232 void (*unlink_setup) (struct rpc_message *, struct inode *dir);
1233 void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
1224 int (*unlink_done) (struct rpc_task *, struct inode *); 1234 int (*unlink_done) (struct rpc_task *, struct inode *);
1225 int (*rename) (struct inode *, struct qstr *, 1235 int (*rename) (struct inode *, struct qstr *,
1226 struct inode *, struct qstr *); 1236 struct inode *, struct qstr *);