diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-06 15:15:47 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-06 15:15:47 +0200 |
| commit | 62473a2d6f513296e896b64ccfd7ceb7b963795e (patch) | |
| tree | 7c14fea07bad9d179971afaaf9c1f8954e923ed7 /fs/read_write.c | |
| parent | nfsd: remove nfsd_vfs_read (diff) | |
| download | linux-62473a2d6f513296e896b64ccfd7ceb7b963795e.tar.xz linux-62473a2d6f513296e896b64ccfd7ceb7b963795e.zip | |
move file_{start,end}_write() out of do_iter_write()
... 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>
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index acfd3dc63d57..be1125b30aec 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -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) |