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

Commit d070f9dd authored by Aurelien Aptel's avatar Aurelien Aptel Committed by Steve French
Browse files

CIFS: check CIFS_MOUNT_NO_DFS when trying to reuse existing sb 



if we mount A then mount A again with nodfs, we shouldn't reuse the
superblock. document the purpose of the defines as well.

there are most likely more flags that needs to be added to this mask,
in fact the logic to find them should be which flag should
be *ignored* when trying to reuse an existing sb.

Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent c8b6ac1a

fs/cifs/cifsglob.h

+10 −1
Original line number Diff line number Diff line
@@ -596,6 +596,10 @@ struct smb_vol { 
	unsigned int max_credits; /* smb3 max_credits 10 < credits < 60000 */

};



/**

 * CIFS superblock mount flags (mnt_cifs_flags) to consider when

 * trying to reuse existing superblock for a new mount

 */

#define CIFS_MOUNT_MASK (CIFS_MOUNT_NO_PERM | CIFS_MOUNT_SET_UID | \

			 CIFS_MOUNT_SERVER_INUM | CIFS_MOUNT_DIRECT_IO | \

			 CIFS_MOUNT_NO_XATTR | CIFS_MOUNT_MAP_SPECIAL_CHR | \
@@ -606,8 +610,13 @@ struct smb_vol { 
			 CIFS_MOUNT_NOPOSIXBRL | CIFS_MOUNT_NOSSYNC | \

			 CIFS_MOUNT_FSCACHE | CIFS_MOUNT_MF_SYMLINKS | \

			 CIFS_MOUNT_MULTIUSER | CIFS_MOUNT_STRICT_IO | \

			 CIFS_MOUNT_CIFS_BACKUPUID | CIFS_MOUNT_CIFS_BACKUPGID)

			 CIFS_MOUNT_CIFS_BACKUPUID | CIFS_MOUNT_CIFS_BACKUPGID | \

			 CIFS_MOUNT_NO_DFS)



/**

 * Generic VFS superblock mount flags (s_flags) to consider when

 * trying to reuse existing superblock for a new mount

 */

#define CIFS_MS_MASK (SB_RDONLY | SB_MANDLOCK | SB_NOEXEC | SB_NOSUID | \

		      SB_NODEV | SB_SYNCHRONOUS)