SUNRPC: rpc_pipefs cleanup

Move the files[] array closer to rpc_fill_super()

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index e5f37ded1565aa6ade92cf608a954f7b745526d8..2a4e6eb0a3e9a424c216c62c5eeeed810a78c376 100644 (file)
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -397,19 +397,6 @@ static const struct file_operations rpc_info_operations = {
 };
 
 
-/*
- * We have a single directory with 1 node in it.
- */
-enum {
-       RPCAUTH_lockd,
-       RPCAUTH_mount,
-       RPCAUTH_nfs,
-       RPCAUTH_portmap,
-       RPCAUTH_statd,
-       RPCAUTH_nfsd4_cb,
-       RPCAUTH_RootEOF
-};
-
 /*
  * Description of fs contents.
  */
@@ -419,33 +406,6 @@ struct rpc_filelist {
        umode_t mode;
 };
 
-static const struct rpc_filelist files[] = {
-       [RPCAUTH_lockd] = {
-               .name = "lockd",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-       [RPCAUTH_mount] = {
-               .name = "mount",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-       [RPCAUTH_nfs] = {
-               .name = "nfs",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-       [RPCAUTH_portmap] = {
-               .name = "portmap",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-       [RPCAUTH_statd] = {
-               .name = "statd",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-       [RPCAUTH_nfsd4_cb] = {
-               .name = "nfsd4_cb",
-               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
-       },
-};
-
 enum {
        RPCAUTH_info,
        RPCAUTH_EOF
@@ -965,6 +925,46 @@ static struct super_operations s_ops = {
 
 #define RPCAUTH_GSSMAGIC 0x67596969
 
+/*
+ * We have a single directory with 1 node in it.
+ */
+enum {
+       RPCAUTH_lockd,
+       RPCAUTH_mount,
+       RPCAUTH_nfs,
+       RPCAUTH_portmap,
+       RPCAUTH_statd,
+       RPCAUTH_nfsd4_cb,
+       RPCAUTH_RootEOF
+};
+
+static const struct rpc_filelist files[] = {
+       [RPCAUTH_lockd] = {
+               .name = "lockd",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+       [RPCAUTH_mount] = {
+               .name = "mount",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+       [RPCAUTH_nfs] = {
+               .name = "nfs",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+       [RPCAUTH_portmap] = {
+               .name = "portmap",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+       [RPCAUTH_statd] = {
+               .name = "statd",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+       [RPCAUTH_nfsd4_cb] = {
+               .name = "nfsd4_cb",
+               .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+       },
+};
+
 static int
 rpc_fill_super(struct super_block *sb, void *data, int silent)
 {