2 files changed, 16 insertions, 7 deletions

diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index 51b977a4ca20..cea764c2359f 100644
--- 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 *);
 };
 
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 55b2049834c4..c9b57f47108c 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -169,16 +169,24 @@ static int
 rpc_pipe_open(struct inode *inode, struct file *filp)
 {
         struct rpc_inode *rpci = RPC_I(inode);
+        int first_open;
         int res = -ENXIO;
 
         mutex_lock(&inode->i_mutex);
-        if (rpci->ops != NULL) {
-                if (filp->f_mode & FMODE_READ)
-                        rpci->nreaders ++;
-                if (filp->f_mode & FMODE_WRITE)
-                        rpci->nwriters ++;
-                res = 0;
+        if (rpci->ops == NULL)
+                goto out;
+        first_open = rpci->nreaders == 0 && rpci->nwriters == 0;
+        if (first_open && rpci->ops->open_pipe) {
+                res = rpci->ops->open_pipe(inode);
+                if (res)
+                        goto out;
         }
+        if (filp->f_mode & FMODE_READ)
+                rpci->nreaders++;
+        if (filp->f_mode & FMODE_WRITE)
+                rpci->nwriters++;
+        res = 0;
+out:
         mutex_unlock(&inode->i_mutex);
         return res;
 }
@@ -748,7 +756,7 @@ rpc_rmdir(struct dentry *dentry)
  * @name: name of pipe
  * @private: private data to associate with the pipe, for the caller's use
  * @ops: operations defining the behavior of the pipe: upcall, downcall,
- *      release_pipe, and destroy_msg.
+ *      release_pipe, open_pipe, and destroy_msg.
  * @flags: rpc_inode flags
  *
  * Data is made available for userspace to read by calls to