Commit adf2314f authored by Al Viro's avatar Al Viro Committed by Anna Schumaker
Browse files

nfs: get rid of ->set_security() 



it's always either nfs_set_sb_security() or nfs_clone_sb_security(),
the choice being controlled by mount_info->cloned != NULL.  No need
to add methods, especially when both instances live right next to
the caller and are never accessed anywhere else.

Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent ba8b6148

fs/nfs/internal.h

+0 −3
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct nfs_mount_request { 


struct nfs_mount_info {

	unsigned int inherited_bsize;

	int (*set_security)(struct super_block *, struct dentry *, struct nfs_mount_info *);

	struct nfs_parsed_mount_data *parsed;

	struct nfs_clone_mount *cloned;

	struct nfs_server *server;
@@ -391,8 +390,6 @@ extern struct file_system_type nfs4_referral_fs_type; 
#endif

bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t);

struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *);

int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *);

void nfs_kill_super(struct super_block *);

fs/nfs/namespace.c

+0 −1
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, 
	};

	struct nfs_mount_info mount_info = {

		.inherited_bsize = sb->s_blocksize_bits,

		.set_security = nfs_clone_sb_security,

		.cloned = &mountdata,

		.mntfh = fh,

		.nfs_mod = NFS_SB(sb)->nfs_client->cl_nfs_mod,

fs/nfs/nfs4super.c

+0 −3
Original line number Diff line number Diff line
@@ -201,8 +201,6 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, 
	struct nfs_parsed_mount_data *data = mount_info->parsed;

	struct dentry *res;



	mount_info->set_security = nfs_set_sb_security;



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



	res = do_nfs4_mount(nfs4_create_server(mount_info),
@@ -224,7 +222,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, 
{

	struct nfs_clone_mount *data = raw_data;

	struct nfs_mount_info mount_info = {

		.set_security = nfs_clone_sb_security,

		.cloned = data,

		.nfs_mod = &nfs_v4,

	};

fs/nfs/super.c

+21 −48
Original line number Diff line number Diff line
@@ -2550,52 +2550,6 @@ static void nfs_get_cache_cookie(struct super_block *sb, 
}

#endif



int nfs_set_sb_security(struct super_block *s, struct dentry *mntroot,

			struct nfs_mount_info *mount_info)

{

	int error;

	unsigned long kflags = 0, kflags_out = 0;

	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)

		kflags |= SECURITY_LSM_NATIVE_LABELS;



	error = security_sb_set_mnt_opts(s, mount_info->parsed->lsm_opts,

						kflags, &kflags_out);

	if (error)

		goto err;



	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL &&

		!(kflags_out & SECURITY_LSM_NATIVE_LABELS))

		NFS_SB(s)->caps &= ~NFS_CAP_SECURITY_LABEL;

err:

	return error;

}

EXPORT_SYMBOL_GPL(nfs_set_sb_security);



int nfs_clone_sb_security(struct super_block *s, struct dentry *mntroot,

			  struct nfs_mount_info *mount_info)

{

	int error;

	unsigned long kflags = 0, kflags_out = 0;



	/* clone any lsm security options from the parent to the new sb */

	if (d_inode(mntroot)->i_fop != &nfs_dir_operations)

		return -ESTALE;



	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)

		kflags |= SECURITY_LSM_NATIVE_LABELS;



	error = security_sb_clone_mnt_opts(mount_info->cloned->sb, s, kflags,

			&kflags_out);

	if (error)

		return error;



	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL &&

		!(kflags_out & SECURITY_LSM_NATIVE_LABELS))

		NFS_SB(s)->caps &= ~NFS_CAP_SECURITY_LABEL;

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_clone_sb_security);



static void nfs_set_readahead(struct backing_dev_info *bdi,

			      unsigned long iomax_pages)

{
@@ -2610,6 +2564,7 @@ static struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, 
	struct dentry *mntroot = ERR_PTR(-ENOMEM);

	int (*compare_super)(struct super_block *, void *) = nfs_compare_super;

	struct nfs_server *server = mount_info->server;

	unsigned long kflags = 0, kflags_out = 0;

	struct nfs_sb_mountdata sb_mntdata = {

		.mntflags = flags,

		.server = server,
@@ -2670,7 +2625,26 @@ static struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, 
	if (IS_ERR(mntroot))

		goto error_splat_super;



	error = mount_info->set_security(s, mntroot, mount_info);



	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)

		kflags |= SECURITY_LSM_NATIVE_LABELS;

	if (mount_info->cloned) {

		if (d_inode(mntroot)->i_fop != &nfs_dir_operations) {

			error = -ESTALE;

			goto error_splat_root;

		}

		/* clone any lsm security options from the parent to the new sb */

		error = security_sb_clone_mnt_opts(mount_info->cloned->sb, s, kflags,

				&kflags_out);

	} else {

		error = security_sb_set_mnt_opts(s, mount_info->parsed->lsm_opts,

							kflags, &kflags_out);

	}

	if (error)

		goto error_splat_root;

	if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL &&

		!(kflags_out & SECURITY_LSM_NATIVE_LABELS))

		NFS_SB(s)->caps &= ~NFS_CAP_SECURITY_LABEL;

	if (error)

		goto error_splat_root;
@@ -2695,7 +2669,6 @@ struct dentry *nfs_fs_mount(struct file_system_type *fs_type, 
	int flags, const char *dev_name, void *raw_data)

{

	struct nfs_mount_info mount_info = {

		.set_security = nfs_set_sb_security,

	};

	struct dentry *mntroot = ERR_PTR(-ENOMEM);

	struct nfs_subversion *nfs_mod;