Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index b28c83475ee8e9106c5f567551e4307156dfe465..ca3bcc4ed4e55563ecd505fada0cc0dc1f5dbb8d 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -878,7 +878,7 @@ struct nfs3_readdirargs {
        struct nfs_fh *         fh;
        __u64                   cookie;
        __be32                  verf[2];
-       int                     plus;
+       bool                    plus;
        unsigned int            count;
        struct page **          pages;
 };
@@ -909,7 +909,7 @@ struct nfs3_linkres {
 struct nfs3_readdirres {
        struct nfs_fattr *      dir_attr;
        __be32 *                verf;
-       int                     plus;
+       bool                    plus;
 };
 
 struct nfs3_getaclres {
@@ -1012,7 +1012,6 @@ struct nfs4_link_res {
        struct nfs_fattr *              dir_attr;
 };
 
-
 struct nfs4_lookup_arg {
        struct nfs4_sequence_args       seq_args;
        const struct nfs_fh *           dir_fh;
@@ -1028,6 +1027,20 @@ struct nfs4_lookup_res {
        struct nfs4_label               *label;
 };
 
+struct nfs4_lookupp_arg {
+       struct nfs4_sequence_args       seq_args;
+       const struct nfs_fh             *fh;
+       const u32                       *bitmask;
+};
+
+struct nfs4_lookupp_res {
+       struct nfs4_sequence_res        seq_res;
+       const struct nfs_server         *server;
+       struct nfs_fattr                *fattr;
+       struct nfs_fh                   *fh;
+       struct nfs4_label               *label;
+};
+
 struct nfs4_lookup_root_arg {
        struct nfs4_sequence_args       seq_args;
        const u32 *                     bitmask;
@@ -1053,7 +1066,7 @@ struct nfs4_readdir_arg {
        struct page **                  pages;  /* zero-copy data */
        unsigned int                    pgbase; /* zero-copy data */
        const u32 *                     bitmask;
-       int                             plus;
+       bool                            plus;
 };
 
 struct nfs4_readdir_res {
@@ -1422,6 +1435,7 @@ enum {
        NFS_IOHDR_STAT,
 };
 
+struct nfs_io_completion;
 struct nfs_pgio_header {
        struct inode            *inode;
        struct rpc_cred         *cred;
@@ -1435,8 +1449,8 @@ struct nfs_pgio_header {
        void (*release) (struct nfs_pgio_header *hdr);
        const struct nfs_pgio_completion_ops *completion_ops;
        const struct nfs_rw_ops *rw_ops;
+       struct nfs_io_completion *io_completion;
        struct nfs_direct_req   *dreq;
-       void                    *layout_private;
        spinlock_t              lock;
        /* fields protected by lock */
        int                     pnfs_error;
@@ -1533,6 +1547,7 @@ struct nfs_renamedata {
        struct nfs_fattr        new_fattr;
        void (*complete)(struct rpc_task *, struct nfs_renamedata *);
        long timeout;
+       bool cancelled;
 };
 
 struct nfs_access_entry;
@@ -1567,6 +1582,8 @@ struct nfs_rpc_ops {
        int     (*lookup)  (struct inode *, const struct qstr *,
                            struct nfs_fh *, struct nfs_fattr *,
                            struct nfs4_label *);
+       int     (*lookupp) (struct inode *, struct nfs_fh *,
+                           struct nfs_fattr *, struct nfs4_label *);
        int     (*access)  (struct inode *, struct nfs_access_entry *);
        int     (*readlink)(struct inode *, struct page *, unsigned int,
                            unsigned int);
@@ -1585,7 +1602,7 @@ struct nfs_rpc_ops {
        int     (*mkdir)   (struct inode *, struct dentry *, struct iattr *);
        int     (*rmdir)   (struct inode *, const struct qstr *);
        int     (*readdir) (struct dentry *, struct rpc_cred *,
-                           u64, struct page **, unsigned int, int);
+                           u64, struct page **, unsigned int, bool);
        int     (*mknod)   (struct inode *, struct dentry *, struct iattr *,
                            dev_t);
        int     (*statfs)  (struct nfs_server *, struct nfs_fh *,
@@ -1595,7 +1612,7 @@ struct nfs_rpc_ops {
        int     (*pathconf) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_pathconf *);
        int     (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
-       int     (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, int);
+       int     (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, bool);
        int     (*pgio_rpc_prepare)(struct rpc_task *,
                                    struct nfs_pgio_header *);
        void    (*read_setup)(struct nfs_pgio_header *, struct rpc_message *);