diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-11 11:41:00 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-11 11:41:00 -0800 |
| commit | 8b94bcb923dff923a5a5b7c6f890702a54cb19cf (patch) | |
| tree | 2ea55c01e0c5dfead8699484b0bae2a375b1f61c /fs/cifs/readdir.c | |
| parent | 1b397f4f1c167dbf06397b3182fca521c00125c4 (diff) | |
| download | op-kernel-dev-8b94bcb923dff923a5a5b7c6f890702a54cb19cf.zip op-kernel-dev-8b94bcb923dff923a5a5b7c6f890702a54cb19cf.tar.gz | |
[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 a86bd1c..fc61567 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -193,8 +193,14 @@ static void fill_in_inode(struct inode *tmp_inode, if (S_ISREG(tmp_inode->i_mode)) { cFYI(1, ("File inode")); tmp_inode->i_op = &cifs_file_inode_ops; - if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) - tmp_inode->i_fop = &cifs_file_direct_ops; + if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) { + if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) + tmp_inode->i_fop = &cifs_file_direct_nobrl_ops; + else + tmp_inode->i_fop = &cifs_file_direct_ops; + + } else if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) + tmp_inode->i_fop = &cifs_file_nobrl_ops; else tmp_inode->i_fop = &cifs_file_ops; if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) |
