[PATCH] drivers/mtd/: small cleanups

[linux-2.6-omap-h63xx.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9f422fd876738ac4bb2ff41a568945f791672a83..7fafc4c546b7fb735a8d0ce6725fbe07d31df049 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -220,6 +220,12 @@ struct nfs_lockt_res {
 struct nfs4_delegreturnargs {
        const struct nfs_fh *fhandle;
        const nfs4_stateid *stateid;
+       const u32 * bitmask;
+};
+
+struct nfs4_delegreturnres {
+       struct nfs_fattr * fattr;
+       const struct nfs_server *server;
 };
 
 /*
@@ -689,7 +695,6 @@ struct nfs_read_data {
 #ifdef CONFIG_NFS_V4
        unsigned long           timestamp;      /* For lease renewal */
 #endif
-       void (*complete) (struct nfs_read_data *, int);
        struct page             *page_array[NFS_PAGEVEC_SIZE + 1];
 };
 
@@ -708,7 +713,6 @@ struct nfs_write_data {
 #ifdef CONFIG_NFS_V4
        unsigned long           timestamp;      /* For lease renewal */
 #endif
-       void (*complete) (struct nfs_write_data *, int);
        struct page             *page_array[NFS_PAGEVEC_SIZE + 1];
 };
 
@@ -763,8 +767,11 @@ struct nfs_rpc_ops {
                             struct nfs_pathconf *);
        u32 *   (*decode_dirent)(u32 *, struct nfs_entry *, int plus);
        void    (*read_setup)   (struct nfs_read_data *);
+       int     (*read_done)  (struct rpc_task *, struct nfs_read_data *);
        void    (*write_setup)  (struct nfs_write_data *, int how);
+       int     (*write_done)  (struct rpc_task *, struct nfs_write_data *);
        void    (*commit_setup) (struct nfs_write_data *, int how);
+       int     (*commit_done) (struct rpc_task *, struct nfs_write_data *);
        int     (*file_open)   (struct inode *, struct file *);
        int     (*file_release) (struct inode *, struct file *);
        int     (*lock)(struct file *, int, struct file_lock *);