Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index a2cbc8303dae15581fac408b3be3959794a83c05..0cc7033aa413527973b92eb1a6bedda8e92da470 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -925,12 +925,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;
@@ -973,7 +971,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;
@@ -1241,7 +1241,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)