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

Commit 3c7c87fd authored by Sachin Prabhu's avatar Sachin Prabhu Committed by Steve French
Browse files

CIFS: Show backupuid/gid in /proc/mounts 



Show  backupuid/backupgid in /proc/mounts for cifs shares mounted with
the backupuid/backupgid feature.

Also consolidate the two separate checks for
pvolume_info->backupuid_specified into a single if condition in
cifs_setup_cifs_sb().

Signed-off-by: default avatarSachin Prabhu <sprabhu@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 3af9d8f2

fs/cifs/cifsfs.c

+4 −0
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_printf(s, ",noperm");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)

		seq_printf(s, ",strictcache");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)

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

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)

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



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

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

fs/cifs/connect.c

+6 −6
Original line number Diff line number Diff line
@@ -3228,10 +3228,6 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, 


	cifs_sb->mnt_uid = pvolume_info->linux_uid;

	cifs_sb->mnt_gid = pvolume_info->linux_gid;

	if (pvolume_info->backupuid_specified)

		cifs_sb->mnt_backupuid = pvolume_info->backupuid;

	if (pvolume_info->backupgid_specified)

		cifs_sb->mnt_backupgid = pvolume_info->backupgid;

	cifs_sb->mnt_file_mode = pvolume_info->file_mode;

	cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;

	cFYI(1, "file mode: 0x%hx  dir mode: 0x%hx",
@@ -3262,10 +3258,14 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, 
		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_RWPIDFORWARD;

	if (pvolume_info->cifs_acl)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_ACL;

	if (pvolume_info->backupuid_specified)

	if (pvolume_info->backupuid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPUID;

	if (pvolume_info->backupgid_specified)

		cifs_sb->mnt_backupuid = pvolume_info->backupuid;

	}

	if (pvolume_info->backupgid_specified) {

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_CIFS_BACKUPGID;

		cifs_sb->mnt_backupgid = pvolume_info->backupgid;

	}

	if (pvolume_info->override_uid)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_OVERR_UID;

	if (pvolume_info->override_gid)