move file_{start,end}_write() out of do_iter_write()
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 6 Jul 2017 13:15:47 +0000 (09:15 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 6 Jul 2017 13:15:47 +0000 (09:15 -0400)
... and do *not* grab it in vfs_write_iter().

Fixes: "fs: implement vfs_iter_read using do_iter_read"
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/read_write.c

index acfd3dc63d5704474d4701cec0f46309ebf8e36a..be1125b30aec206fb23a9f10f8a3175448df29ac 100644 (file)
@@ -931,12 +931,10 @@ static ssize_t do_iter_write(struct file *file, struct iov_iter *iter,
        if (ret < 0)
                return ret;
 
-       file_start_write(file);
        if (file->f_op->write_iter)
                ret = do_iter_readv_writev(file, iter, pos, WRITE, flags);
        else
                ret = do_loop_readv_writev(file, iter, pos, WRITE, flags);
-       file_end_write(file);
        if (ret > 0)
                fsnotify_modify(file);
        return ret;
@@ -979,7 +977,9 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
 
        ret = import_iovec(WRITE, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter);
        if (ret >= 0) {
+               file_start_write(file);
                ret = do_iter_write(file, &iter, pos, flags);
+               file_end_write(file);
                kfree(iov);
        }
        return ret;
@@ -1247,7 +1247,9 @@ static size_t compat_writev(struct file *file,
 
        ret = compat_import_iovec(WRITE, vec, vlen, UIO_FASTIOV, &iov, &iter);
        if (ret >= 0) {
+               file_start_write(file);
                ret = do_iter_write(file, &iter, pos, flags);
+               file_end_write(file);
                kfree(iov);
        }
        if (ret > 0)