diff options
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 6c9ee8014ff0..8852470b4fbb 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -44,13 +44,17 @@ static void cifs_set_ops(struct inode *inode) | |||
| 44 | inode->i_fop = &cifs_file_direct_nobrl_ops; | 44 | inode->i_fop = &cifs_file_direct_nobrl_ops; |
| 45 | else | 45 | else |
| 46 | inode->i_fop = &cifs_file_direct_ops; | 46 | inode->i_fop = &cifs_file_direct_ops; |
| 47 | } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) { | ||
| 48 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | ||
| 49 | inode->i_fop = &cifs_file_strict_nobrl_ops; | ||
| 50 | else | ||
| 51 | inode->i_fop = &cifs_file_strict_ops; | ||
| 47 | } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | 52 | } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) |
| 48 | inode->i_fop = &cifs_file_nobrl_ops; | 53 | inode->i_fop = &cifs_file_nobrl_ops; |
| 49 | else { /* not direct, send byte range locks */ | 54 | else { /* not direct, send byte range locks */ |
| 50 | inode->i_fop = &cifs_file_ops; | 55 | inode->i_fop = &cifs_file_ops; |
| 51 | } | 56 | } |
| 52 | 57 | ||
| 53 | |||
| 54 | /* check if server can support readpages */ | 58 | /* check if server can support readpages */ |
| 55 | if (cifs_sb_master_tcon(cifs_sb)->ses->server->maxBuf < | 59 | if (cifs_sb_master_tcon(cifs_sb)->ses->server->maxBuf < |
| 56 | PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE) | 60 | PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE) |
| @@ -1679,7 +1683,7 @@ cifs_inode_needs_reval(struct inode *inode) | |||
| 1679 | /* | 1683 | /* |
| 1680 | * Zap the cache. Called when invalid_mapping flag is set. | 1684 | * Zap the cache. Called when invalid_mapping flag is set. |
| 1681 | */ | 1685 | */ |
| 1682 | static void | 1686 | void |
| 1683 | cifs_invalidate_mapping(struct inode *inode) | 1687 | cifs_invalidate_mapping(struct inode *inode) |
| 1684 | { | 1688 | { |
| 1685 | int rc; | 1689 | int rc; |
