fs: fix kernel_read prototype

Use proper ssize_t and size_t types for the return value and count
argument, move the offset last and make it an in/out argument like
all other read/write helpers, and make the buf argument a void pointer
to get rid of lots of casts in the callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 4 deletions

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 02e1859f2ca8..243fa1c28b4a 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -986,8 +986,9 @@ static ssize_t bin_intvec(struct file *file,
                 size_t length = oldlen / sizeof(*vec);
                 char *str, *end;
                 int i;
+                loff_t pos = 0;
 
-                result = kernel_read(file, 0, buffer, BUFSZ - 1);
+                result = kernel_read(file, buffer, BUFSZ - 1, &pos);
                 if (result < 0)
                         goto out_kfree;
 
@@ -1057,8 +1058,9 @@ static ssize_t bin_ulongvec(struct file *file,
                 size_t length = oldlen / sizeof(*vec);
                 char *str, *end;
                 int i;
+                loff_t pos = 0;
 
-                result = kernel_read(file, 0, buffer, BUFSZ - 1);
+                result = kernel_read(file, buffer, BUFSZ - 1, &pos);
                 if (result < 0)
                         goto out_kfree;
 
@@ -1120,8 +1122,9 @@ static ssize_t bin_uuid(struct file *file,
         if (oldval && oldlen) {
                 char buf[UUID_STRING_LEN + 1];
                 uuid_t uuid;
+                loff_t pos = 0;
 
-                result = kernel_read(file, 0, buf, sizeof(buf) - 1);
+                result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
                 if (result < 0)
                         goto out;
 
@@ -1154,8 +1157,9 @@ static ssize_t bin_dn_node_address(struct file *file,
                 char buf[15], *nodep;
                 unsigned long area, node;
                 __le16 dnaddr;
+                loff_t pos = 0;
 
-                result = kernel_read(file, 0, buf, sizeof(buf) - 1);
+                result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
                 if (result < 0)
                         goto out;