aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYouling Tang <[email protected]>2024-04-25 17:16:59 +0800
committerKent Overstreet <[email protected]>2024-07-14 19:00:12 -0400
commit630d565ddad52c1777ec3b48de04ecdc21004991 (patch)
tree68a081151490f4447a8c831df6f76a404cb205be
parentda6fa380d369a7e4d61f7a654efb48a018e3e563 (diff)
bcachefs: Use filemap_read() to simplify the execution flow
Using filemap_read() can reduce unnecessary code execution for non IOCB_DIRECT paths. Signed-off-by: Youling Tang <[email protected]> Signed-off-by: Kent Overstreet <[email protected]>
-rw-r--r--fs/bcachefs/fs-io-direct.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/fs-io-direct.c b/fs/bcachefs/fs-io-direct.c
index 049b61bc9a5b..e246b1e05aa2 100644
--- a/fs/bcachefs/fs-io-direct.c
+++ b/fs/bcachefs/fs-io-direct.c
@@ -179,7 +179,7 @@ ssize_t bch2_read_iter(struct kiocb *iocb, struct iov_iter *iter)
struct bch_inode_info *inode = file_bch_inode(file);
struct address_space *mapping = file->f_mapping;
size_t count = iov_iter_count(iter);
- ssize_t ret;
+ ssize_t ret = 0;
if (!count)
return 0; /* skip atime */
@@ -205,7 +205,7 @@ ssize_t bch2_read_iter(struct kiocb *iocb, struct iov_iter *iter)
iocb->ki_pos += ret;
} else {
bch2_pagecache_add_get(inode);
- ret = generic_file_read_iter(iocb, iter);
+ ret = filemap_read(iocb, iter, ret);
bch2_pagecache_add_put(inode);
}
out: