aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-02-24 09:44:19 -0500
committerSteve French <sfrench@us.ibm.com>2009-03-11 21:36:20 -0400
commit4717bed6806dab0270e5bfbc45e9f999e63ededd (patch)
treed0a59d62c3fdd24329e970036f052a5138d6579a
parent7fc8f4e95bf9564045985bb206af8e28a5e4e28f (diff)
[CIFS] fix build error
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/cifs_fs_sb.h2
-rw-r--r--fs/cifs/connect.c2
-rw-r--r--fs/cifs/file.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index e9f177bb0658..4797787c6a44 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -32,7 +32,7 @@
32#define CIFS_MOUNT_OVERR_GID 0x800 /* override gid returned from server */ 32#define CIFS_MOUNT_OVERR_GID 0x800 /* override gid returned from server */
33#define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */ 33#define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */
34#define CIFS_MOUNT_NOPOSIXBRL 0x2000 /* mandatory not posix byte range lock */ 34#define CIFS_MOUNT_NOPOSIXBRL 0x2000 /* mandatory not posix byte range lock */
35#define CIFS_MOUNT_NO_SSYNC 0x4000 /* don't do slow SMBflush on every sync*/ 35#define CIFS_MOUNT_NOSSYNC 0x4000 /* don't do slow SMBflush on every sync*/
36 36
37struct cifs_sb_info { 37struct cifs_sb_info {
38 struct cifsTconInfo *tcon; /* primary mount */ 38 struct cifsTconInfo *tcon; /* primary mount */
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 18e84a4e0504..cd4ccc8ce471 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2166,7 +2166,7 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info,
2166 if (pvolume_info->nobrl) 2166 if (pvolume_info->nobrl)
2167 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL; 2167 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL;
2168 if (pvolume_info->nostrictsync) 2168 if (pvolume_info->nostrictsync)
2169 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_SSYNC; 2169 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOSSYNC;
2170 if (pvolume_info->mand_lock) 2170 if (pvolume_info->mand_lock)
2171 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL; 2171 cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL;
2172 if (pvolume_info->cifs_acl) 2172 if (pvolume_info->cifs_acl)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 6603cb4024fb..e4ecb1cb0b13 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1584,7 +1584,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
1584 CIFS_I(inode)->write_behind_rc = 0; 1584 CIFS_I(inode)->write_behind_rc = 0;
1585 tcon = CIFS_SB(inode->i_sb)->tcon; 1585 tcon = CIFS_SB(inode->i_sb)->tcon;
1586 if (!rc && tcon && smbfile && 1586 if (!rc && tcon && smbfile &&
1587 !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_SSYNC)) 1587 !(CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC))
1588 rc = CIFSSMBFlush(xid, tcon, smbfile->netfid); 1588 rc = CIFSSMBFlush(xid, tcon, smbfile->netfid);
1589 } 1589 }
1590 1590