Commit 6a74490d authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Pass super operations and xattr handlers in the nfs_subversion 



I can set all variables in the nfs_fill_super() function, allowing me to
remove the nfs4_fill_super() function.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1179acc6

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ void nfs_zap_acl_cache(struct inode *inode); 
extern int nfs_wait_bit_killable(void *word);



/* super.c */

extern const struct super_operations nfs_sops;

extern struct file_system_type nfs_fs_type;

extern struct file_system_type nfs_xdev_fs_type;

#ifdef CONFIG_NFS_V4

fs/nfs/nfs.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ struct nfs_subversion { 
	struct file_system_type *nfs_fs;	/* NFS filesystem type */

	const struct rpc_version *rpc_vers;	/* NFS version information */

	const struct nfs_rpc_ops *rpc_ops;	/* NFS operations */

	const struct super_operations *sops;	/* NFS Super operations */

	const struct xattr_handler **xattr;	/* NFS xattr handlers */

	struct list_head list;		/* List of NFS versions */

};

fs/nfs/nfs2super.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ static struct nfs_subversion nfs_v2 = { 
	.nfs_fs   = &nfs_fs_type,

	.rpc_vers = &nfs_version2,

	.rpc_ops  = &nfs_v2_clientops,

	.sops     = &nfs_sops,

};



int __init init_nfs_v2(void)

fs/nfs/nfs3super.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ static struct nfs_subversion nfs_v3 = { 
	.nfs_fs   = &nfs_fs_type,

	.rpc_vers = &nfs_version3,

	.rpc_ops  = &nfs_v3_clientops,

	.sops     = &nfs_sops,

};



int __init init_nfs_v3(void)

fs/nfs/nfs4super.c

+3 −21
Original line number Diff line number Diff line
@@ -71,25 +71,10 @@ struct nfs_subversion nfs_v4 = { 
	.nfs_fs   = &nfs4_fs_type,

	.rpc_vers = &nfs_version4,

	.rpc_ops  = &nfs_v4_clientops,

	.sops     = &nfs4_sops,

	.xattr    = nfs4_xattr_handlers,

};



/*

 * Set up an NFS4 superblock

 */

static void nfs4_fill_super(struct super_block *sb,

			    struct nfs_mount_info *mount_info)

{

	sb->s_time_gran = 1;

	sb->s_op = &nfs4_sops;

	/*

	 * The VFS shouldn't apply the umask to mode bits. We will do

	 * so ourselves when necessary.

	 */

	sb->s_flags  |= MS_POSIXACL;

	sb->s_xattr = nfs4_xattr_handlers;

	nfs_initialise_sb(sb);

}



/*

 * Get the superblock for the NFS4 root partition

 */
@@ -101,7 +86,6 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags, 
	struct nfs_server *server;

	struct dentry *mntroot = ERR_PTR(-ENOMEM);



	mount_info->fill_super = nfs4_fill_super;

	mount_info->set_security = nfs_set_sb_security;



	/* Get a volume representation */
@@ -236,8 +220,6 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, 


	dfprintk(MOUNT, "--> nfs4_try_mount()\n");



	mount_info->fill_super = nfs4_fill_super;



	export_path = data->nfs_server.export_path;

	data->nfs_server.export_path = "/";

	root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info,
@@ -257,7 +239,7 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, 
			   const char *dev_name, void *raw_data)

{

	struct nfs_mount_info mount_info = {

		.fill_super = nfs4_fill_super,

		.fill_super = nfs_fill_super,

		.set_security = nfs_clone_sb_security,

		.cloned = raw_data,

	};