Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / include / linux / sunrpc / rpc_pipe_fs.h

diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index ad293760f6ebaa23b6d1c85666eb78e57ffc873e..cea764c2359fd743bd2d2342fd71492aabdd02a3 100644 (file)
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -15,6 +15,7 @@ struct rpc_pipe_ops {
        ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char __user *, size_t);
        ssize_t (*downcall)(struct file *, const char __user *, size_t);
        void (*release_pipe)(struct inode *);
+       int (*open_pipe)(struct inode *);
        void (*destroy_msg)(struct rpc_pipe_msg *);
 };
 
@@ -23,9 +24,11 @@ struct rpc_inode {
        void *private;
        struct list_head pipe;
        struct list_head in_upcall;
+       struct list_head in_downcall;
        int pipelen;
        int nreaders;
        int nwriters;
+       int nkern_readwriters;
        wait_queue_head_t waitq;
 #define RPC_PIPE_WAIT_FOR_OPEN 1
        int flags;