Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62473a2d authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a4058c5b

fs/read_write.c

+4 −2
Original line number Diff line number Diff line
@@ -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)