Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH 05/11] fs: remove __vfs_write
Date: Fri, 8 May 2020 11:22:16 +0200 [thread overview]
Message-ID: <20200508092222.2097-6-hch@lst.de> (raw)
In-Reply-To: <20200508092222.2097-1-hch@lst.de>
Fold it into the two callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/read_write.c | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/fs/read_write.c b/fs/read_write.c
index 6b456a257b31c..67a035782874b 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -488,17 +488,6 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t
return ret;
}
-static ssize_t __vfs_write(struct file *file, const char __user *p,
- size_t count, loff_t *pos)
-{
- if (file->f_op->write)
- return file->f_op->write(file, p, count, pos);
- else if (file->f_op->write_iter)
- return new_sync_write(file, p, count, pos);
- else
- return -EINVAL;
-}
-
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
mm_segment_t old_fs;
@@ -516,7 +505,12 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t
p = (__force const char __user *)buf;
if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
- ret = __vfs_write(file, p, count, pos);
+ if (file->f_op->write)
+ ret = file->f_op->write(file, p, count, pos);
+ else if (file->f_op->write_iter)
+ ret = new_sync_write(file, p, count, pos);
+ else
+ ret = -EINVAL;
set_fs(old_fs);
if (ret > 0) {
fsnotify_modify(file);
@@ -553,19 +547,23 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
return -EFAULT;
ret = rw_verify_area(WRITE, file, pos, count);
- if (!ret) {
- if (count > MAX_RW_COUNT)
- count = MAX_RW_COUNT;
- file_start_write(file);
- ret = __vfs_write(file, buf, count, pos);
- if (ret > 0) {
- fsnotify_modify(file);
- add_wchar(current, ret);
- }
- inc_syscw(current);
- file_end_write(file);
+ if (ret)
+ return ret;
+ if (count > MAX_RW_COUNT)
+ count = MAX_RW_COUNT;
+ file_start_write(file);
+ if (file->f_op->write)
+ ret = file->f_op->write(file, buf, count, pos);
+ else if (file->f_op->write_iter)
+ ret = new_sync_write(file, buf, count, pos);
+ else
+ ret = -EINVAL;
+ if (ret > 0) {
+ fsnotify_modify(file);
+ add_wchar(current, ret);
}
-
+ inc_syscw(current);
+ file_end_write(file);
return ret;
}
--
2.26.2
next prev parent reply other threads:[~2020-05-08 9:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 9:22 clean up kernel_{read,write} & friends Christoph Hellwig
2020-05-08 9:22 ` [PATCH 01/11] fs: call file_{start,end}_write from __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 02/11] fs: check FMODE_WRITE in __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 03/11] fs: remove the call_{read,write}_iter functions Christoph Hellwig
2020-05-08 9:22 ` [PATCH 04/11] fs: implement kernel_write using __kernel_write Christoph Hellwig
2020-05-08 9:22 ` Christoph Hellwig [this message]
2020-05-08 9:22 ` [PATCH 06/11] fs: don't change the address limit for ->write_iter in __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 07/11] fs: add a __kernel_read helper Christoph Hellwig
2020-05-08 9:22 ` [PATCH 08/11] integrity/ima: switch to using __kernel_read Christoph Hellwig
2020-05-08 9:22 ` [PATCH 09/11] fs: implement kernel_read " Christoph Hellwig
2020-05-08 9:22 ` [PATCH 10/11] fs: remove __vfs_read Christoph Hellwig
2020-05-08 15:45 ` Ira Weiny
2020-05-08 15:46 ` Christoph Hellwig
2020-05-08 9:22 ` [PATCH 11/11] fs: don't change the address limit for ->read_iter in __kernel_read Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200508092222.2097-6-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--subject='Re: [PATCH 05/11] fs: remove __vfs_write' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).