Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb156749 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: rpc_pipefs cleanup 



Move the files[] array closer to rpc_fill_super()

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ac6fecee

net/sunrpc/rpc_pipe.c

+40 −40
Original line number Original line Diff line number Diff line
@@ -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.

 * Description of fs contents.

 */

 */
@@ -419,33 +406,6 @@ struct rpc_filelist { 
	umode_t mode;

	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 {

enum {

	RPCAUTH_info,

	RPCAUTH_info,

	RPCAUTH_EOF

	RPCAUTH_EOF
@@ -965,6 +925,46 @@ static struct super_operations s_ops = { 




#define RPCAUTH_GSSMAGIC 0x67596969

#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

static int

rpc_fill_super(struct super_block *sb, void *data, int silent)

rpc_fill_super(struct super_block *sb, void *data, int silent)

{

{