GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-19 21:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

export kernel_write(), convert open-coded instances

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-02-23 14:51:48 -05:00
parent 94e07a7590
commit 7bb307e894
5 changed files with 24 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

39
kernel/sysctl_binary.c
View file

@ -971,7 +971,6 @@ out:
static ssize_t bin_intvec(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{
mm_segment_t old_fs = get_fs();
ssize_t copied = 0;
char *buffer;
ssize_t result;
@ -984,13 +983,10 @@ static ssize_t bin_intvec(struct file *file,
if (oldval && oldlen) {
unsigned __user *vec = oldval;
size_t length = oldlen / sizeof(*vec);
loff_t pos = 0;
char *str, *end;
int i;
set_fs(KERNEL_DS);
result = vfs_read(file, buffer, BUFSZ - 1, &pos);
set_fs(old_fs);
result = kernel_read(file, 0, buffer, BUFSZ - 1);
if (result < 0)
goto out_kfree;
@ -1017,7 +1013,6 @@ static ssize_t bin_intvec(struct file *file,
if (newval && newlen) {
unsigned __user *vec = newval;
size_t length = newlen / sizeof(*vec);
loff_t pos = 0;
char *str, *end;
int i;
@ -1033,9 +1028,7 @@ static ssize_t bin_intvec(struct file *file,
str += snprintf(str, end - str, "%lu\t", value);
}
set_fs(KERNEL_DS);
result = vfs_write(file, buffer, str - buffer, &pos);
set_fs(old_fs);
result = kernel_write(file, buffer, str - buffer, 0);
if (result < 0)
goto out_kfree;
}
@ -1049,7 +1042,6 @@ out:
static ssize_t bin_ulongvec(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{
mm_segment_t old_fs = get_fs();
ssize_t copied = 0;
char *buffer;
ssize_t result;
@ -1062,13 +1054,10 @@ static ssize_t bin_ulongvec(struct file *file,
if (oldval && oldlen) {
unsigned long __user *vec = oldval;
size_t length = oldlen / sizeof(*vec);
loff_t pos = 0;
char *str, *end;
int i;
set_fs(KERNEL_DS);
result = vfs_read(file, buffer, BUFSZ - 1, &pos);
set_fs(old_fs);
result = kernel_read(file, 0, buffer, BUFSZ - 1);
if (result < 0)
goto out_kfree;
@ -1095,7 +1084,6 @@ static ssize_t bin_ulongvec(struct file *file,
if (newval && newlen) {
unsigned long __user *vec = newval;
size_t length = newlen / sizeof(*vec);
loff_t pos = 0;
char *str, *end;
int i;
@ -1111,9 +1099,7 @@ static ssize_t bin_ulongvec(struct file *file,
str += snprintf(str, end - str, "%lu\t", value);
}
set_fs(KERNEL_DS);
result = vfs_write(file, buffer, str - buffer, &pos);
set_fs(old_fs);
result = kernel_write(file, buffer, str - buffer, 0);
if (result < 0)
goto out_kfree;
}
@ -1127,19 +1113,15 @@ out:
static ssize_t bin_uuid(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{
mm_segment_t old_fs = get_fs();
ssize_t result, copied = 0;
/* Only supports reads */
if (oldval && oldlen) {
loff_t pos = 0;
char buf[40], *str = buf;
unsigned char uuid[16];
int i;
set_fs(KERNEL_DS);
result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
set_fs(old_fs);
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
if (result < 0)
goto out;
@ -1175,18 +1157,14 @@ out:
static ssize_t bin_dn_node_address(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{
mm_segment_t old_fs = get_fs();
ssize_t result, copied = 0;
if (oldval && oldlen) {
loff_t pos = 0;
char buf[15], *nodep;
unsigned long area, node;
__le16 dnaddr;
set_fs(KERNEL_DS);
result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
set_fs(old_fs);
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
if (result < 0)
goto out;
@ -1215,7 +1193,6 @@ static ssize_t bin_dn_node_address(struct file *file,
}
if (newval && newlen) {
loff_t pos = 0;
__le16 dnaddr;
char buf[15];
int len;
@ -1232,9 +1209,7 @@ static ssize_t bin_dn_node_address(struct file *file,
le16_to_cpu(dnaddr) >> 10,
le16_to_cpu(dnaddr) & 0x3ff);
set_fs(KERNEL_DS);
result = vfs_write(file, buf, len, &pos);
set_fs(old_fs);
result = kernel_write(file, buf, len, 0);
if (result < 0)
goto out;
}