From: "J. Bruce Fields" <bfields@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, abe@purdue.edu,
lsof-l@lists.purdue.edu, util-linux@vger.kernel.org,
jlayton@redhat.com, "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 06/10] rpc: replace rpc_filelist by tree_descr
Date: Thu, 25 Apr 2019 10:04:16 -0400 [thread overview]
Message-ID: <1556201060-7947-7-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1556201060-7947-1-git-send-email-bfields@redhat.com>
From: "J. Bruce Fields" <bfields@redhat.com>
Use a common structure instead of defining our own here.
The only difference is using an int instead of umode_t for the mode
field; I haven't tried to figure out why tree_descr uses int.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/rpc_pipe.c | 37 ++++++++++++++-----------------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 69663681bf9d..9af9f4c8fa1e 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -460,15 +460,6 @@ static const struct file_operations rpc_info_operations = {
};
-/*
- * Description of fs contents.
- */
-struct rpc_filelist {
- const char *name;
- const struct file_operations *i_fop;
- umode_t mode;
-};
-
static struct inode *
rpc_get_inode(struct super_block *sb, umode_t mode)
{
@@ -648,7 +639,7 @@ static struct dentry *__rpc_lookup_create_exclusive(struct dentry *parent,
* FIXME: This probably has races.
*/
static void __rpc_depopulate(struct dentry *parent,
- const struct rpc_filelist *files,
+ const struct tree_descr *files,
int start, int eof)
{
struct inode *dir = d_inode(parent);
@@ -680,7 +671,7 @@ static void __rpc_depopulate(struct dentry *parent,
}
static void rpc_depopulate(struct dentry *parent,
- const struct rpc_filelist *files,
+ const struct tree_descr *files,
int start, int eof)
{
struct inode *dir = d_inode(parent);
@@ -691,7 +682,7 @@ static void rpc_depopulate(struct dentry *parent,
}
static int rpc_populate(struct dentry *parent,
- const struct rpc_filelist *files,
+ const struct tree_descr *files,
int start, int eof,
void *private)
{
@@ -711,7 +702,7 @@ static int rpc_populate(struct dentry *parent,
case S_IFREG:
err = __rpc_create(dir, dentry,
files[i].mode,
- files[i].i_fop,
+ files[i].ops,
private);
break;
case S_IFDIR:
@@ -1015,10 +1006,10 @@ enum {
RPCAUTH_EOF
};
-static const struct rpc_filelist authfiles[] = {
+static const struct tree_descr authfiles[] = {
[RPCAUTH_info] = {
.name = "info",
- .i_fop = &rpc_info_operations,
+ .ops = &rpc_info_operations,
.mode = S_IFREG | 0400,
},
};
@@ -1076,20 +1067,20 @@ int rpc_remove_client_dir(struct rpc_clnt *rpc_client)
return rpc_rmdir_depopulate(dentry, rpc_clntdir_depopulate);
}
-static const struct rpc_filelist cache_pipefs_files[3] = {
+static const struct tree_descr cache_pipefs_files[3] = {
[0] = {
.name = "channel",
- .i_fop = &cache_file_operations_pipefs,
+ .ops = &cache_file_operations_pipefs,
.mode = S_IFREG | 0600,
},
[1] = {
.name = "content",
- .i_fop = &content_file_operations_pipefs,
+ .ops = &content_file_operations_pipefs,
.mode = S_IFREG | 0400,
},
[2] = {
.name = "flush",
- .i_fop = &cache_flush_operations_pipefs,
+ .ops = &cache_flush_operations_pipefs,
.mode = S_IFREG | 0600,
},
};
@@ -1145,7 +1136,7 @@ enum {
RPCAUTH_RootEOF
};
-static const struct rpc_filelist files[] = {
+static const struct tree_descr files[] = {
[RPCAUTH_lockd] = {
.name = "lockd",
.mode = S_IFDIR | 0555,
@@ -1242,7 +1233,7 @@ void rpc_put_sb_net(const struct net *net)
}
EXPORT_SYMBOL_GPL(rpc_put_sb_net);
-static const struct rpc_filelist gssd_dummy_clnt_dir[] = {
+static const struct tree_descr gssd_dummy_clnt_dir[] = {
[0] = {
.name = "clntXX",
.mode = S_IFDIR | 0555,
@@ -1277,10 +1268,10 @@ rpc_dummy_info_show(struct seq_file *m, void *v)
}
DEFINE_SHOW_ATTRIBUTE(rpc_dummy_info);
-static const struct rpc_filelist gssd_dummy_info_file[] = {
+static const struct tree_descr gssd_dummy_info_file[] = {
[0] = {
.name = "info",
- .i_fop = &rpc_dummy_info_fops,
+ .ops = &rpc_dummy_info_fops,
.mode = S_IFREG | 0400,
},
};
--
2.20.1
next prev parent reply other threads:[~2019-04-25 14:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 14:04 [PATCH 00/10] exposing knfsd opens to userspace J. Bruce Fields
2019-04-25 14:04 ` [PATCH 01/10] nfsd: persist nfsd filesystem across mounts J. Bruce Fields
2019-04-25 14:04 ` [PATCH 02/10] nfsd: rename cl_refcount J. Bruce Fields
2019-04-25 14:04 ` [PATCH 03/10] nfsd4: use reference count to free client J. Bruce Fields
2019-04-25 14:04 ` [PATCH 04/10] nfsd: add nfsd/clients directory J. Bruce Fields
2019-04-25 14:04 ` [PATCH 05/10] nfsd: make client/ directory names small ints J. Bruce Fields
2019-04-25 14:04 ` J. Bruce Fields [this message]
2019-04-25 14:04 ` [PATCH 07/10] nfsd4: add a client info file J. Bruce Fields
2019-04-25 14:04 ` [PATCH 08/10] nfsd4: add file to display list of client's opens J. Bruce Fields
2019-04-25 18:04 ` Jeff Layton
2019-04-25 20:14 ` J. Bruce Fields
2019-04-25 21:14 ` Andreas Dilger
2019-04-26 1:18 ` J. Bruce Fields
2019-05-16 0:40 ` J. Bruce Fields
2019-04-25 14:04 ` [PATCH 09/10] nfsd: expose some more information about NFSv4 opens J. Bruce Fields
2019-05-02 15:28 ` Benjamin Coddington
2019-05-02 15:58 ` Andrew W Elble
2019-05-07 1:02 ` J. Bruce Fields
2019-04-25 14:04 ` [PATCH 10/10] nfsd: add more information to client info file J. Bruce Fields
2019-04-25 17:02 ` [PATCH 00/10] exposing knfsd opens to userspace Jeff Layton
2019-04-25 20:01 ` J. Bruce Fields
2019-04-25 18:17 ` Jeff Layton
2019-04-25 21:08 ` Andreas Dilger
2019-04-25 23:20 ` NeilBrown
2019-04-26 11:00 ` Andreas Dilger
2019-04-26 12:56 ` J. Bruce Fields
2019-04-26 23:55 ` NeilBrown
2019-04-27 19:00 ` J. Bruce Fields
2019-04-28 22:57 ` NeilBrown
2019-04-27 0:03 ` NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1556201060-7947-7-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--cc=abe@purdue.edu \
--cc=jlayton@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=lsof-l@lists.purdue.edu \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).