diff options
author | Long Li <longli@microsoft.com> | 2018-10-31 22:13:11 +0000 |
---|---|---|
committer | Steve French <stfrench@microsoft.com> | 2018-11-02 14:09:42 -0500 |
commit | be4eb68846dc4450a9a4998d7c16d9f4955f9988 (patch) | |
tree | dbca86b4ebf406eb7cfa1fd8184daabba44b415b /fs | |
parent | 8c5f9c1ab7cb45f6584ce312b14fb310a8fa28f3 (diff) | |
download | linux-stable-be4eb68846dc4450a9a4998d7c16d9f4955f9988.tar.gz linux-stable-be4eb68846dc4450a9a4998d7c16d9f4955f9988.tar.bz2 linux-stable-be4eb68846dc4450a9a4998d7c16d9f4955f9988.zip |
CIFS: Add direct I/O functions to file_operations
With direct read/write functions implemented, add them to file_operations.
Dircet I/O is used under two conditions:
1. When mounting with "cache=none", CIFS uses direct I/O for all user file
data transfer.
2. When opening a file with O_DIRECT, CIFS uses direct I/O for all data
transfer on this file.
Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsfs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index b7ac09e38159..1b21262ec874 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1180,9 +1180,8 @@ const struct file_operations cifs_file_strict_ops = { }; const struct file_operations cifs_file_direct_ops = { - /* BB reevaluate whether they can be done with directio, no cache */ - .read_iter = cifs_user_readv, - .write_iter = cifs_user_writev, + .read_iter = cifs_direct_readv, + .write_iter = cifs_direct_writev, .open = cifs_open, .release = cifs_close, .lock = cifs_lock, @@ -1236,9 +1235,8 @@ const struct file_operations cifs_file_strict_nobrl_ops = { }; const struct file_operations cifs_file_direct_nobrl_ops = { - /* BB reevaluate whether they can be done with directio, no cache */ - .read_iter = cifs_user_readv, - .write_iter = cifs_user_writev, + .read_iter = cifs_direct_readv, + .write_iter = cifs_direct_writev, .open = cifs_open, .release = cifs_close, .fsync = cifs_fsync, |