Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1723436

[PATCH 03/16] fs: move kernel_write to fs/read_write.c

Show all headers | View raw

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/read_write.c | 17 ++++++++++++++++-
 fs/splice.c     | 16 ----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index 0cc7033aa413..417dbe199505 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -496,9 +496,24 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
 	inc_syscw(current);
 	return ret;
 }
-
 EXPORT_SYMBOL(__kernel_write);
 
+ssize_t kernel_write(struct file *file, const char *buf, size_t count,
+			    loff_t pos)
+{
+	mm_segment_t old_fs;
+	ssize_t res;
+
+	old_fs = get_fs();
+	set_fs(get_ds());
+	/* The cast to a user pointer is valid due to the set_fs() */
+	res = vfs_write(file, (__force const char __user *)buf, count, &pos);
+	set_fs(old_fs);
+
+	return res;
+}
+EXPORT_SYMBOL(kernel_write);
+
 ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
 {
 	ssize_t ret;
diff --git a/fs/splice.c b/fs/splice.c
index ae41201d0325..f3084cce0ea6 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -364,22 +364,6 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec,
 	return res;
 }
 
-ssize_t kernel_write(struct file *file, const char *buf, size_t count,
-			    loff_t pos)
-{
-	mm_segment_t old_fs;
-	ssize_t res;
-
-	old_fs = get_fs();
-	set_fs(get_ds());
-	/* The cast to a user pointer is valid due to the set_fs() */
-	res = vfs_write(file, (__force const char __user *)buf, count, &pos);
-	set_fs(old_fs);
-
-	return res;
-}
-EXPORT_SYMBOL(kernel_write);
-
 static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
 				 struct pipe_inode_info *pipe, size_t len,
 				 unsigned int flags)
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

switch in-kernel read/write calls to kernel_read/write Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 08/16] mm/nommu: switch do_mmap_private to kernel_read Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
    Re: [PATCH 08/16] mm/nommu: switch do_mmap_private to kernel_read Al Viro <viro@ZenIV.linux.org.uk> - 2017-08-30 17:50 +0200
      Re: [PATCH 08/16] mm/nommu: switch do_mmap_private to kernel_read Christoph Hellwig <hch@lst.de> - 2017-09-01 12:50 +0200
  [PATCH 09/16] net/9p: switch p9_fd_read to kernel_write Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 15/16] fs: unexport vfs_read and vfs_write Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 02/16] autofs4: switch autofs4_write to __kernel_write Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
    Re: [PATCH 02/16] autofs4: switch autofs4_write to __kernel_write Al Viro <viro@ZenIV.linux.org.uk> - 2017-08-30 17:40 +0200
      Re: [PATCH 02/16] autofs4: switch autofs4_write to __kernel_write Christoph Hellwig <hch@lst.de> - 2017-09-01 12:30 +0200
  [PATCH 13/16] lustre: switch to kernel_write Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 03/16] fs: move kernel_write to fs/read_write.c Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 04/16] fs: move kernel_read to fs/read_write.c Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
  [PATCH 06/16] fs: fix kernel_write prototype Christoph Hellwig <hch@lst.de> - 2017-08-30 17:10 +0200
    Re: [PATCH 06/16] fs: fix kernel_write prototype Al Viro <viro@ZenIV.linux.org.uk> - 2017-08-30 17:40 +0200
      Re: [PATCH 06/16] fs: fix kernel_write prototype Christoph Hellwig <hch@lst.de> - 2017-09-01 12:50 +0200

csiph-web