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

Groups > linux.kernel > #1725159

[PATCH 07/17] fs: make the buf argument to __kernel_write a void pointer

Show all headers | View raw

This matches kernel_read and kernel_write and avoids any need for casts in
the callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/read_write.c    | 2 +-
 include/linux/fs.h | 2 +-
 kernel/acct.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index 9f3aeb101d73..7415f94511e5 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -487,7 +487,7 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
 }
 EXPORT_SYMBOL(__vfs_write);
 
-ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
+ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
 {
 	mm_segment_t old_fs;
 	const char __user *p;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 0e7d3da8a307..9ab7e2bf7dd1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2780,7 +2780,7 @@ extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t,
 				    enum kernel_read_file_id);
 extern ssize_t kernel_read(struct file *, void *, size_t, loff_t *);
 extern ssize_t kernel_write(struct file *, const void *, size_t, loff_t *);
-extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+extern ssize_t __kernel_write(struct file *, const void *, size_t, loff_t *);
 extern struct file * open_exec(const char *);
  
 /* fs/dcache.c -- generic fs support functions */
diff --git a/kernel/acct.c b/kernel/acct.c
index 5b1284370367..5e72af29ab73 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -516,7 +516,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
 	if (file_start_write_trylock(file)) {
 		/* it's been opened O_APPEND, so position is irrelevant */
 		loff_t pos = 0;
-		__kernel_write(file, (char *)&ac, sizeof(acct_t), &pos);
+		__kernel_write(file, &ac, sizeof(acct_t), &pos);
 		file_end_write(file);
 	}
 out:
-- 
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 V2 Christoph Hellwig <hch@lst.de> - 2017-09-01 17:40 +0200
  [PATCH 01/17] ashmem: switch to ->read_iter Christoph Hellwig <hch@lst.de> - 2017-09-01 17:40 +0200
  [PATCH 06/17] fs: fix kernel_write prototype Christoph Hellwig <hch@lst.de> - 2017-09-01 17:40 +0200
  [PATCH 04/17] fs: move kernel_read to fs/read_write.c Christoph Hellwig <hch@lst.de> - 2017-09-01 17:40 +0200
  [PATCH 03/17] fs: move kernel_write to fs/read_write.c Christoph Hellwig <hch@lst.de> - 2017-09-01 17:40 +0200
  [PATCH 15/17] fs: unexport __vfs_read/__vfs_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 16/17] fs: unexport vfs_read and vfs_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 07/17] fs: make the buf argument to __kernel_write a void pointer Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 14/17] lustre: switch to kernel_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 02/17] autofs4: switch autofs4_write to __kernel_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 10/17] net/9p: switch p9_fd_read to kernel_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 09/17] mm/nommu: switch do_mmap_private to kernel_read Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 05/17] fs: fix kernel_read prototype Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 13/17] gadget/f_mass_storage: stop messing with the address limit Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 12/17] mconsole: switch to kernel_read Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 08/17] serial2002: switch serial2002_tty_write to kernel_{read/write} Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 17/17] fs: unexport vfs_readv and vfs_writev Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200
  [PATCH 11/17] btrfs: switch write_buf to kernel_write Christoph Hellwig <hch@lst.de> - 2017-09-01 17:50 +0200

csiph-web