aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl_binary.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-09-01 11:39:14 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-09-04 19:05:15 -0400
commite13ec939e96b13e664bb6cee361cc976a0ee621a (patch)
tree9537ad39e7cc842c1f6d756aba43b1f753be9eaa /kernel/sysctl_binary.c
parentbdd1d2d3d251c65b74ac4493e08db18971c09240 (diff)
fs: fix kernel_write prototype
Make the position an in/out argument like all the other read/write helpers and and make the buf argument a void pointer. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/sysctl_binary.c')
-rw-r--r--kernel/sysctl_binary.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 243fa1c28b4a..58ea8c03662e 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1017,6 +1017,7 @@ static ssize_t bin_intvec(struct file *file,
1017 size_t length = newlen / sizeof(*vec); 1017 size_t length = newlen / sizeof(*vec);
1018 char *str, *end; 1018 char *str, *end;
1019 int i; 1019 int i;
1020 loff_t pos = 0;
1020 1021
1021 str = buffer; 1022 str = buffer;
1022 end = str + BUFSZ; 1023 end = str + BUFSZ;
@@ -1030,7 +1031,7 @@ static ssize_t bin_intvec(struct file *file,
1030 str += scnprintf(str, end - str, "%lu\t", value); 1031 str += scnprintf(str, end - str, "%lu\t", value);
1031 } 1032 }
1032 1033
1033 result = kernel_write(file, buffer, str - buffer, 0); 1034 result = kernel_write(file, buffer, str - buffer, &pos);
1034 if (result < 0) 1035 if (result < 0)
1035 goto out_kfree; 1036 goto out_kfree;
1036 } 1037 }
@@ -1089,6 +1090,7 @@ static ssize_t bin_ulongvec(struct file *file,
1089 size_t length = newlen / sizeof(*vec); 1090 size_t length = newlen / sizeof(*vec);
1090 char *str, *end; 1091 char *str, *end;
1091 int i; 1092 int i;
1093 loff_t pos = 0;
1092 1094
1093 str = buffer; 1095 str = buffer;
1094 end = str + BUFSZ; 1096 end = str + BUFSZ;
@@ -1102,7 +1104,7 @@ static ssize_t bin_ulongvec(struct file *file,
1102 str += scnprintf(str, end - str, "%lu\t", value); 1104 str += scnprintf(str, end - str, "%lu\t", value);
1103 } 1105 }
1104 1106
1105 result = kernel_write(file, buffer, str - buffer, 0); 1107 result = kernel_write(file, buffer, str - buffer, &pos);
1106 if (result < 0) 1108 if (result < 0)
1107 goto out_kfree; 1109 goto out_kfree;
1108 } 1110 }
@@ -1192,6 +1194,7 @@ static ssize_t bin_dn_node_address(struct file *file,
1192 __le16 dnaddr; 1194 __le16 dnaddr;
1193 char buf[15]; 1195 char buf[15];
1194 int len; 1196 int len;
1197 loff_t pos = 0;
1195 1198
1196 result = -EINVAL; 1199 result = -EINVAL;
1197 if (newlen != sizeof(dnaddr)) 1200 if (newlen != sizeof(dnaddr))
@@ -1205,7 +1208,7 @@ static ssize_t bin_dn_node_address(struct file *file,
1205 le16_to_cpu(dnaddr) >> 10, 1208 le16_to_cpu(dnaddr) >> 10,
1206 le16_to_cpu(dnaddr) & 0x3ff); 1209 le16_to_cpu(dnaddr) & 0x3ff);
1207 1210
1208 result = kernel_write(file, buf, len, 0); 1211 result = kernel_write(file, buf, len, &pos);
1209 if (result < 0) 1212 if (result < 0)
1210 goto out; 1213 goto out;
1211 } 1214 }