diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-11 14:41:00 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-11 14:41:00 -0500 |
commit | 8b94bcb923dff923a5a5b7c6f890702a54cb19cf (patch) | |
tree | 2ea55c01e0c5dfead8699484b0bae2a375b1f61c /fs/cifs/readdir.c | |
parent | 1b397f4f1c167dbf06397b3182fca521c00125c4 (diff) |
[CIFS] Fix CIFS "nobrl" mount option so does not disable sending brl requests
for all mounts just that particular mount.
Found by Arjan Vand de Ven
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r-- | fs/cifs/readdir.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index a86bd1c07602..fc615670f4b8 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -193,8 +193,14 @@ static void fill_in_inode(struct inode *tmp_inode, | |||
193 | if (S_ISREG(tmp_inode->i_mode)) { | 193 | if (S_ISREG(tmp_inode->i_mode)) { |
194 | cFYI(1, ("File inode")); | 194 | cFYI(1, ("File inode")); |
195 | tmp_inode->i_op = &cifs_file_inode_ops; | 195 | tmp_inode->i_op = &cifs_file_inode_ops; |
196 | if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) | 196 | if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) { |
197 | tmp_inode->i_fop = &cifs_file_direct_ops; | 197 | if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) |
198 | tmp_inode->i_fop = &cifs_file_direct_nobrl_ops; | ||
199 | else | ||
200 | tmp_inode->i_fop = &cifs_file_direct_ops; | ||
201 | |||
202 | } else if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | ||
203 | tmp_inode->i_fop = &cifs_file_nobrl_ops; | ||
198 | else | 204 | else |
199 | tmp_inode->i_fop = &cifs_file_ops; | 205 | tmp_inode->i_fop = &cifs_file_ops; |
200 | if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) | 206 | if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) |