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

Commit 4717bed6 authored by Steve French's avatar Steve French
Browse files

[CIFS] fix build error 



Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7fc8f4e9

fs/cifs/cifs_fs_sb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define CIFS_MOUNT_OVERR_GID    0x800 /* override gid returned from server    */

#define CIFS_MOUNT_OVERR_GID    0x800 /* override gid returned from server    */

#define CIFS_MOUNT_DYNPERM      0x1000 /* allow in-memory only mode setting   */

#define CIFS_MOUNT_DYNPERM      0x1000 /* allow in-memory only mode setting   */

#define CIFS_MOUNT_NOPOSIXBRL   0x2000 /* mandatory not posix byte range lock */

#define CIFS_MOUNT_NOPOSIXBRL   0x2000 /* mandatory not posix byte range lock */

#define CIFS_MOUNT_NO_SSYNC     0x4000 /* don't do slow SMBflush on every sync*/

#define CIFS_MOUNT_NOSSYNC      0x4000 /* don't do slow SMBflush on every sync*/





struct cifs_sb_info {

struct cifs_sb_info {

	struct cifsTconInfo *tcon;	/* primary mount */

	struct cifsTconInfo *tcon;	/* primary mount */

fs/cifs/connect.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2166,7 +2166,7 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info, 
	if (pvolume_info->nobrl)

	if (pvolume_info->nobrl)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL;

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL;

	if (pvolume_info->nostrictsync)

	if (pvolume_info->nostrictsync)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_SSYNC;

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOSSYNC;

	if (pvolume_info->mand_lock)

	if (pvolume_info->mand_lock)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL;

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL;

	if (pvolume_info->cifs_acl)

	if (pvolume_info->cifs_acl)

fs/cifs/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1584,7 +1584,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync) 
		CIFS_I(inode)->write_behind_rc = 0;

		CIFS_I(inode)->write_behind_rc = 0;

		tcon = CIFS_SB(inode->i_sb)->tcon;

		tcon = CIFS_SB(inode->i_sb)->tcon;

		if (!rc && tcon && smbfile &&

		if (!rc && tcon && smbfile &&

		   !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_SSYNC))

		   !(CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC))

			rc = CIFSSMBFlush(xid, tcon, smbfile->netfid);

			rc = CIFSSMBFlush(xid, tcon, smbfile->netfid);

	}

	}