Pull more set_fs removal from Al Viro: "Christoph's 'use kernel_read and friends rather than open-coding set_fs()' series" * 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: unexport vfs_readv and vfs_writev fs: unexport vfs_read and vfs_write fs: unexport __vfs_read/__vfs_write lustre: switch to kernel_write gadget/f_mass_storage: stop messing with the address limit mconsole: switch to kernel_read btrfs: switch write_buf to kernel_write net/9p: switch p9_fd_read to kernel_write mm/nommu: switch do_mmap_private to kernel_read serial2002: switch serial2002_tty_write to kernel_{read/write} fs: make the buf argument to __kernel_write a void pointer fs: fix kernel_write prototype fs: fix kernel_read prototype fs: move kernel_read to fs/read_write.c fs: move kernel_write to fs/read_write.c autofs4: switch autofs4_write to __kernel_write ashmem: switch to ->read_iter
Showing the changes to kernel (2 of 31 files). Show all
Unified · Split
| @@ -516,7 +516,7 @@ static void do_acct_process(struct bsd_acct_struct *acct) · 515 unmodified lines | ||
| 516 | 516 | if (file_start_write_trylock(file)) { |
| 517 | 517 | /* it's been opened O_APPEND, so position is irrelevant */ |
| 518 | 518 | loff_t pos = 0; |
| 519 | − __kernel_write(file, (char *)&ac, sizeof(acct_t), &pos); | |
| 519 | + __kernel_write(file, &ac, sizeof(acct_t), &pos); | |
| 520 | 520 | file_end_write(file); |
| 521 | 521 | } |
| 522 | 522 | out: |
| @@ -986,8 +986,9 @@ static ssize_t bin_intvec(struct file *file, · 985 unmodified lines | ||
| 986 | 986 | size_t length = oldlen / sizeof(*vec); |
| 987 | 987 | char *str, *end; |
| 988 | 988 | int i; |
| 989 | + loff_t pos = 0; | |
| 989 | 990 | |
| 990 | − result = kernel_read(file, 0, buffer, BUFSZ - 1); | |
| 991 | + result = kernel_read(file, buffer, BUFSZ - 1, &pos); | |
| 991 | 992 | if (result < 0) |
| 992 | 993 | goto out_kfree; |
| 993 | 994 | |
| @@ -1016,6 +1017,7 @@ static ssize_t bin_intvec(struct file *file, · 22 unmodified lines | ||
| 1016 | 1017 | size_t length = newlen / sizeof(*vec); |
| 1017 | 1018 | char *str, *end; |
| 1018 | 1019 | int i; |
| 1020 | + loff_t pos = 0; | |
| 1019 | 1021 | |
| 1020 | 1022 | str = buffer; |
| 1021 | 1023 | end = str + BUFSZ; |
| @@ -1029,7 +1031,7 @@ static ssize_t bin_intvec(struct file *file, · 7 unmodified lines | ||
| 1029 | 1031 | str += scnprintf(str, end - str, "%lu\t", value); |
| 1030 | 1032 | } |
| 1031 | 1033 | |
| 1032 | − result = kernel_write(file, buffer, str - buffer, 0); | |
| 1034 | + result = kernel_write(file, buffer, str - buffer, &pos); | |
| 1033 | 1035 | if (result < 0) |
| 1034 | 1036 | goto out_kfree; |
| 1035 | 1037 | } |
| @@ -1057,8 +1059,9 @@ static ssize_t bin_ulongvec(struct file *file, · 21 unmodified lines | ||
| 1057 | 1059 | size_t length = oldlen / sizeof(*vec); |
| 1058 | 1060 | char *str, *end; |
| 1059 | 1061 | int i; |
| 1062 | + loff_t pos = 0; | |
| 1060 | 1063 | |
| 1061 | − result = kernel_read(file, 0, buffer, BUFSZ - 1); | |
| 1064 | + result = kernel_read(file, buffer, BUFSZ - 1, &pos); | |
| 1062 | 1065 | if (result < 0) |
| 1063 | 1066 | goto out_kfree; |
| 1064 | 1067 | |
| @@ -1087,6 +1090,7 @@ static ssize_t bin_ulongvec(struct file *file, · 22 unmodified lines | ||
| 1087 | 1090 | size_t length = newlen / sizeof(*vec); |
| 1088 | 1091 | char *str, *end; |
| 1089 | 1092 | int i; |
| 1093 | + loff_t pos = 0; | |
| 1090 | 1094 | |
| 1091 | 1095 | str = buffer; |
| 1092 | 1096 | end = str + BUFSZ; |
| @@ -1100,7 +1104,7 @@ static ssize_t bin_ulongvec(struct file *file, · 7 unmodified lines | ||
| 1100 | 1104 | str += scnprintf(str, end - str, "%lu\t", value); |
| 1101 | 1105 | } |
| 1102 | 1106 | |
| 1103 | − result = kernel_write(file, buffer, str - buffer, 0); | |
| 1107 | + result = kernel_write(file, buffer, str - buffer, &pos); | |
| 1104 | 1108 | if (result < 0) |
| 1105 | 1109 | goto out_kfree; |
| 1106 | 1110 | } |
| @@ -1120,8 +1124,9 @@ static ssize_t bin_uuid(struct file *file, · 13 unmodified lines | ||
| 1120 | 1124 | if (oldval && oldlen) { |
| 1121 | 1125 | char buf[UUID_STRING_LEN + 1]; |
| 1122 | 1126 | uuid_t uuid; |
| 1127 | + loff_t pos = 0; | |
| 1123 | 1128 | |
| 1124 | − result = kernel_read(file, 0, buf, sizeof(buf) - 1); | |
| 1129 | + result = kernel_read(file, buf, sizeof(buf) - 1, &pos); | |
| 1125 | 1130 | if (result < 0) |
| 1126 | 1131 | goto out; |
| 1127 | 1132 | |
| @@ -1154,8 +1159,9 @@ static ssize_t bin_dn_node_address(struct file *file, · 26 unmodified lines | ||
| 1154 | 1159 | char buf[15], *nodep; |
| 1155 | 1160 | unsigned long area, node; |
| 1156 | 1161 | __le16 dnaddr; |
| 1162 | + loff_t pos = 0; | |
| 1157 | 1163 | |
| 1158 | − result = kernel_read(file, 0, buf, sizeof(buf) - 1); | |
| 1164 | + result = kernel_read(file, buf, sizeof(buf) - 1, &pos); | |
| 1159 | 1165 | if (result < 0) |
| 1160 | 1166 | goto out; |
| 1161 | 1167 | |
| @@ -1188,6 +1194,7 @@ static ssize_t bin_dn_node_address(struct file *file, · 26 unmodified lines | ||
| 1188 | 1194 | __le16 dnaddr; |
| 1189 | 1195 | char buf[15]; |
| 1190 | 1196 | int len; |
| 1197 | + loff_t pos = 0; | |
| 1191 | 1198 | |
| 1192 | 1199 | result = -EINVAL; |
| 1193 | 1200 | if (newlen != sizeof(dnaddr)) |
| @@ -1201,7 +1208,7 @@ static ssize_t bin_dn_node_address(struct file *file, · 7 unmodified lines | ||
| 1201 | 1208 | le16_to_cpu(dnaddr) >> 10, |
| 1202 | 1209 | le16_to_cpu(dnaddr) & 0x3ff); |
| 1203 | 1210 | |
| 1204 | − result = kernel_write(file, buf, len, 0); | |
| 1211 | + result = kernel_write(file, buf, len, &pos); | |
| 1205 | 1212 | if (result < 0) |
| 1206 | 1213 | goto out; |
| 1207 | 1214 | } |