Commit 8401e936 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: remove [gu]id/backup[gu]id/file_mode/dir_mode from cifs_sb 



We can already access these from cifs_sb->ctx so we no longer need
a local copy in cifs_sb.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent ee0dce49

fs/cifs/cifs_fs_sb.h

+0 −6
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ struct cifs_sb_info { 
	unsigned int wsize;

	unsigned long actimeo; /* attribute cache timeout (jiffies) */

	atomic_t active;

	kuid_t	mnt_uid;

	kgid_t	mnt_gid;

	kuid_t	mnt_backupuid;

	kgid_t	mnt_backupgid;

	umode_t	mnt_file_mode;

	umode_t	mnt_dir_mode;

	unsigned int mnt_cifs_flags;

	struct delayed_work prune_tlinks;

	struct rcu_head rcu;

fs/cifs/cifsacl.c

+4 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "cifsacl.h"

#include "cifsproto.h"

#include "cifs_debug.h"

#include "fs_context.h"



/* security id for everyone/world system group */

static const struct cifs_sid sid_everyone = {
@@ -346,8 +347,8 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, 
	struct key *sidkey;

	char *sidstr;

	const struct cred *saved_cred;

	kuid_t fuid = cifs_sb->mnt_uid;

	kgid_t fgid = cifs_sb->mnt_gid;

	kuid_t fuid = cifs_sb->ctx->linux_uid;

	kgid_t fgid = cifs_sb->ctx->linux_gid;



	/*

	 * If we have too many subauthorities, then something is really wrong.
@@ -448,7 +449,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, 


	/*

	 * Note that we return 0 here unconditionally. If the mapping

	 * fails then we just fall back to using the mnt_uid/mnt_gid.

	 * fails then we just fall back to using the ctx->linux_uid/linux_gid.

	 */

got_valid_id:

	rc = 0;

fs/cifs/cifsfs.c

+6 −6
Original line number Diff line number Diff line
@@ -518,14 +518,14 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	}



	seq_printf(s, ",uid=%u",

		   from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid));

		   from_kuid_munged(&init_user_ns, cifs_sb->ctx->linux_uid));

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)

		seq_puts(s, ",forceuid");

	else

		seq_puts(s, ",noforceuid");



	seq_printf(s, ",gid=%u",

		   from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid));

		   from_kgid_munged(&init_user_ns, cifs_sb->ctx->linux_gid));

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)

		seq_puts(s, ",forcegid");

	else
@@ -535,8 +535,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 


	if (!tcon->unix_ext)

		seq_printf(s, ",file_mode=0%ho,dir_mode=0%ho",

					   cifs_sb->mnt_file_mode,

					   cifs_sb->mnt_dir_mode);

					   cifs_sb->ctx->file_mode,

					   cifs_sb->ctx->dir_mode);



	cifs_show_nls(s, cifs_sb->local_nls);
@@ -609,11 +609,11 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)

		seq_printf(s, ",backupuid=%u",

			   from_kuid_munged(&init_user_ns,

					    cifs_sb->mnt_backupuid));

					    cifs_sb->ctx->backupuid));

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)

		seq_printf(s, ",backupgid=%u",

			   from_kgid_munged(&init_user_ns,

					    cifs_sb->mnt_backupgid));

					    cifs_sb->ctx->backupgid));



	seq_printf(s, ",rsize=%u", cifs_sb->rsize);

	seq_printf(s, ",wsize=%u", cifs_sb->wsize);

fs/cifs/connect.c

+5 −10
Original line number Diff line number Diff line
@@ -2240,11 +2240,12 @@ compare_mount_options(struct super_block *sb, struct cifs_mnt_data *mnt_data) 
	if (new->rsize && new->rsize < old->rsize)

		return 0;



	if (!uid_eq(old->mnt_uid, new->mnt_uid) || !gid_eq(old->mnt_gid, new->mnt_gid))

	if (!uid_eq(old->ctx->linux_uid, new->ctx->linux_uid) ||

	    !gid_eq(old->ctx->linux_gid, new->ctx->linux_gid))

		return 0;



	if (old->mnt_file_mode != new->mnt_file_mode ||

	    old->mnt_dir_mode != new->mnt_dir_mode)

	if (old->ctx->file_mode != new->ctx->file_mode ||

	    old->ctx->dir_mode != new->ctx->dir_mode)

		return 0;



	if (strcmp(old->local_nls->charset, new->local_nls->charset))
@@ -2707,12 +2708,8 @@ int cifs_setup_cifs_sb(struct smb3_fs_context *ctx, 
	cifs_sb->rsize = ctx->rsize;

	cifs_sb->wsize = ctx->wsize;



	cifs_sb->mnt_uid = ctx->linux_uid;

	cifs_sb->mnt_gid = ctx->linux_gid;

	cifs_sb->mnt_file_mode = ctx->file_mode;

	cifs_sb->mnt_dir_mode = ctx->dir_mode;

	cifs_dbg(FYI, "file mode: %04ho  dir mode: %04ho\n",

		 cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode);

		 cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode);



	cifs_sb->actimeo = ctx->actimeo;

	cifs_sb->local_nls = ctx->local_nls;
@@ -2751,11 +2748,9 @@ int cifs_setup_cifs_sb(struct smb3_fs_context *ctx, 
		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL;

	if (ctx->backupuid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID;

		cifs_sb->mnt_backupuid = ctx->backupuid;

	}

	if (ctx->backupgid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID;

		cifs_sb->mnt_backupgid = ctx->backupgid;

	}

	if (ctx->override_uid)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID;

fs/cifs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "cifs_fs_sb.h"

#include "fscache.h"

#include "smbdirect.h"

#include "fs_context.h"



static inline int cifs_convert_flags(unsigned int flags)

{
@@ -571,7 +572,7 @@ int cifs_open(struct inode *inode, struct file *file) 
				le64_to_cpu(tcon->fsUnixInfo.Capability))) {

		/* can not refresh inode info since size could be stale */

		rc = cifs_posix_open(full_path, &inode, inode->i_sb,

				cifs_sb->mnt_file_mode /* ignored */,

				cifs_sb->ctx->file_mode /* ignored */,

				file->f_flags, &oplock, &fid.netfid, xid);

		if (rc == 0) {

			cifs_dbg(FYI, "posix open succeeded\n");
@@ -740,7 +741,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
						~(O_CREAT | O_EXCL | O_TRUNC);



		rc = cifs_posix_open(full_path, NULL, inode->i_sb,

				     cifs_sb->mnt_file_mode /* ignored */,

				     cifs_sb->ctx->file_mode /* ignored */,

				     oflags, &oplock, &cfile->fid.netfid, xid);

		if (rc == 0) {

			cifs_dbg(FYI, "posix reopen succeeded\n");