diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
commit | 779608521976e3b8d264f89c67e64c918949cc9b (patch) | |
tree | 12d604aa1a08b5bf556be11ee9c08b5b6b000179 /fs/cifs/dir.c | |
parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
parent | f7667af21736eb231e3589d9f91183d325cabfbe (diff) |
Merge tag 'asoc-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
This is mostly driver fixes, the biggest one being the tlv320aic31xx
which is relatively large but simple and device specific. There's a
small fix in the error handling in DPCM too which is relatively minor
error handling fix.
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r-- | fs/cifs/dir.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 3db0c5fd9a11..6cbd9c688cfe 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -497,6 +497,14 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, goto out; } + if (file->f_flags & O_DIRECT && + CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) { + if (CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_NO_BRL) + file->f_op = &cifs_file_direct_nobrl_ops; + else + file->f_op = &cifs_file_direct_ops; + } + file_info = cifs_new_fileinfo(&fid, file, tlink, oplock); if (file_info == NULL) { if (server->ops->close) |