History

Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

Linus Torvalds committed 9 years ago

Commit 581bfce2 parents cc73fee 9725d4c31 files · +147 −236Browse files

Showing the changes to kernel (2 of 31 files). Show all

Unified · Split

2 files
  1. kernel/acct.c +1 −1
  2. kernel/sysctl_binary.c +14 −7
kernel/acct.c+1−1
@@ -516,7 +516,7 @@ static void do_acct_process(struct bsd_acct_struct *acct) · 515 unmodified lines
516516 if (file_start_write_trylock(file)) {
517517 /* it's been opened O_APPEND, so position is irrelevant */
518518 loff_t pos = 0;
519− __kernel_write(file, (char *)&ac, sizeof(acct_t), &pos);
519+ __kernel_write(file, &ac, sizeof(acct_t), &pos);
520520 file_end_write(file);
521521 }
522522 out:
kernel/sysctl_binary.c+14−7
@@ -986,8 +986,9 @@ static ssize_t bin_intvec(struct file *file, · 985 unmodified lines
986986 size_t length = oldlen / sizeof(*vec);
987987 char *str, *end;
988988 int i;
989+ loff_t pos = 0;
989990
990− result = kernel_read(file, 0, buffer, BUFSZ - 1);
991+ result = kernel_read(file, buffer, BUFSZ - 1, &pos);
991992 if (result < 0)
992993 goto out_kfree;
993994
@@ -1016,6 +1017,7 @@ static ssize_t bin_intvec(struct file *file, · 22 unmodified lines
10161017 size_t length = newlen / sizeof(*vec);
10171018 char *str, *end;
10181019 int i;
1020+ loff_t pos = 0;
10191021
10201022 str = buffer;
10211023 end = str + BUFSZ;
@@ -1029,7 +1031,7 @@ static ssize_t bin_intvec(struct file *file, · 7 unmodified lines
10291031 str += scnprintf(str, end - str, "%lu\t", value);
10301032 }
10311033
1032− result = kernel_write(file, buffer, str - buffer, 0);
1034+ result = kernel_write(file, buffer, str - buffer, &pos);
10331035 if (result < 0)
10341036 goto out_kfree;
10351037 }
@@ -1057,8 +1059,9 @@ static ssize_t bin_ulongvec(struct file *file, · 21 unmodified lines
10571059 size_t length = oldlen / sizeof(*vec);
10581060 char *str, *end;
10591061 int i;
1062+ loff_t pos = 0;
10601063
1061− result = kernel_read(file, 0, buffer, BUFSZ - 1);
1064+ result = kernel_read(file, buffer, BUFSZ - 1, &pos);
10621065 if (result < 0)
10631066 goto out_kfree;
10641067
@@ -1087,6 +1090,7 @@ static ssize_t bin_ulongvec(struct file *file, · 22 unmodified lines
10871090 size_t length = newlen / sizeof(*vec);
10881091 char *str, *end;
10891092 int i;
1093+ loff_t pos = 0;
10901094
10911095 str = buffer;
10921096 end = str + BUFSZ;
@@ -1100,7 +1104,7 @@ static ssize_t bin_ulongvec(struct file *file, · 7 unmodified lines
11001104 str += scnprintf(str, end - str, "%lu\t", value);
11011105 }
11021106
1103− result = kernel_write(file, buffer, str - buffer, 0);
1107+ result = kernel_write(file, buffer, str - buffer, &pos);
11041108 if (result < 0)
11051109 goto out_kfree;
11061110 }
@@ -1120,8 +1124,9 @@ static ssize_t bin_uuid(struct file *file, · 13 unmodified lines
11201124 if (oldval && oldlen) {
11211125 char buf[UUID_STRING_LEN + 1];
11221126 uuid_t uuid;
1127+ loff_t pos = 0;
11231128
1124− result = kernel_read(file, 0, buf, sizeof(buf) - 1);
1129+ result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
11251130 if (result < 0)
11261131 goto out;
11271132
@@ -1154,8 +1159,9 @@ static ssize_t bin_dn_node_address(struct file *file, · 26 unmodified lines
11541159 char buf[15], *nodep;
11551160 unsigned long area, node;
11561161 __le16 dnaddr;
1162+ loff_t pos = 0;
11571163
1158− result = kernel_read(file, 0, buf, sizeof(buf) - 1);
1164+ result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
11591165 if (result < 0)
11601166 goto out;
11611167
@@ -1188,6 +1194,7 @@ static ssize_t bin_dn_node_address(struct file *file, · 26 unmodified lines
11881194 __le16 dnaddr;
11891195 char buf[15];
11901196 int len;
1197+ loff_t pos = 0;
11911198
11921199 result = -EINVAL;
11931200 if (newlen != sizeof(dnaddr))
@@ -1201,7 +1208,7 @@ static ssize_t bin_dn_node_address(struct file *file, · 7 unmodified lines
12011208 le16_to_cpu(dnaddr) >> 10,
12021209 le16_to_cpu(dnaddr) & 0x3ff);
12031210
1204− result = kernel_write(file, buf, len, 0);
1211+ result = kernel_write(file, buf, len, &pos);
12051212 if (result < 0)
12061213 goto out;
12071214 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t