aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-08-09 15:14:16 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-08-09 15:14:16 -0400
commit7364af6a2d5e708b5c6fee3cce08d1bd7b27c9f1 (patch)
treef4ce755e169489cae527c9fd18eaabbd7b6a7e93
parentb693ba4a338da15db1db4b5ebaa36e4ab9781c82 (diff)
SUNRPC: Allow rpc_pipefs_ops to have null values for upcall and downcall
Also ensure that we use the umode_t type when appropriate... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--net/sunrpc/rpc_pipe.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index f6f60f625e3..8fa718201e3 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -417,7 +417,7 @@ enum {
struct rpc_filelist {
char *name;
const struct file_operations *i_fop;
- int mode;
+ umode_t mode;
};
static struct rpc_filelist files[] = {
@@ -516,7 +516,7 @@ rpc_release_path(struct nameidata *nd)
}
static struct inode *
-rpc_get_inode(struct super_block *sb, int mode)
+rpc_get_inode(struct super_block *sb, umode_t mode)
{
struct inode *inode = new_inode(sb);
if (!inode)
@@ -589,7 +589,8 @@ rpc_populate(struct dentry *parent,
struct inode *inode, *dir = parent->d_inode;
void *private = RPC_I(dir)->private;
struct dentry *dentry;
- int mode, i;
+ umode_t mode;
+ int i;
mutex_lock(&dir->i_mutex);
for (i = start; i < eof; i++) {
@@ -783,6 +784,12 @@ struct dentry *rpc_mkpipe(struct dentry *parent, const char *name,
struct dentry *dentry;
struct inode *dir, *inode;
struct rpc_inode *rpci;
+ umode_t umode = S_IFIFO | S_IRUSR | S_IWUSR;
+
+ if (ops->upcall == NULL)
+ umode &= ~S_IRUGO;
+ if (ops->downcall == NULL)
+ umode &= ~S_IWUGO;
dentry = rpc_lookup_create(parent, name, strlen(name), 0);
if (IS_ERR(dentry))
@@ -799,7 +806,7 @@ struct dentry *rpc_mkpipe(struct dentry *parent, const char *name,
rpci->nkern_readwriters++;
goto out;
}
- inode = rpc_get_inode(dir->i_sb, S_IFIFO | S_IRUSR | S_IWUSR);
+ inode = rpc_get_inode(dir->i_sb, umode);
if (!inode)
goto err_dput;
inode->i_ino = iunique(dir->i_sb, 100);