fs: move file_start_write() into vfs_iter_write()

[thirdparty/linux.git] / drivers / target / target_core_file.c

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 4e4cf6c34a775c4483c4b16ad7bf6e78ef72f220..4d447520bab87d6133ba2611f37c4955e641fe5c 100644 (file)
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -332,13 +332,11 @@ static int fd_do_rw(struct se_cmd *cmd, struct file *fd,
        }
 
        iov_iter_bvec(&iter, is_write, bvec, sgl_nents, len);
-       if (is_write) {
-               file_start_write(fd);
+       if (is_write)
                ret = vfs_iter_write(fd, &iter, &pos, 0);
-               file_end_write(fd);
-       } else {
+       else
                ret = vfs_iter_read(fd, &iter, &pos, 0);
-       }
+
        if (is_write) {
                if (ret < 0 || ret != data_length) {
                        pr_err("%s() write returned %d\n", __func__, ret);
@@ -469,9 +467,7 @@ fd_execute_write_same(struct se_cmd *cmd)
        }
 
        iov_iter_bvec(&iter, ITER_SOURCE, bvec, nolb, len);
-       file_start_write(fd_dev->fd_file);
        ret = vfs_iter_write(fd_dev->fd_file, &iter, &pos, 0);
-       file_end_write(fd_dev->fd_file);
 
        kfree(bvec);
        if (ret < 0 || ret != len) {