[CIFS] fix build error

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index e9f177bb06585f3b91788f54ba91fce117922931..4797787c6a4450cc14c9faa062ee55fac762f03d 100644 (file)
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -32,7 +32,7 @@
 #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_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 cifsTconInfo *tcon;      /* primary mount */

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 18e84a4e0504d5695586e5aec4f23e3bf89862ee..cd4ccc8ce4711aa5bedbf4f79670bde9f3a88d0f 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2166,7 +2166,7 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info,
        if (pvolume_info->nobrl)
                cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL;
        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)
                cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL;
        if (pvolume_info->cifs_acl)

diff --cc fs/cifs/file.c
Simple merge