The patch titled
uml: change remaining callers of os_{read_write}_file
has been removed from the -mm tree. Its filename was
uml-change-remaining-callers-of-os_read_write_file.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: change remaining callers of os_{read_write}_file
From: Jeff Dike <jdike@xxxxxxxxxxx>
Convert all remaining os_{read_write}_file users to use the simple
{read,write} wrappers, os_{read_write}_file_k.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/drivers/chan_kern.c | 4 ++--
arch/um/drivers/cow_sys.h | 2 +-
arch/um/drivers/net_user.c | 6 +++---
arch/um/drivers/ubd_kern.c | 2 +-
arch/um/kernel/initrd.c | 2 +-
arch/um/kernel/physmem.c | 2 +-
arch/um/sys-i386/bugs.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff -puN arch/um/drivers/chan_kern.c~uml-change-remaining-callers-of-os_read_write_file arch/um/drivers/chan_kern.c
--- a/arch/um/drivers/chan_kern.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/drivers/chan_kern.c
@@ -98,7 +98,7 @@ int generic_read(int fd, char *c_out, vo
{
int n;
- n = os_read_file(fd, c_out, sizeof(*c_out));
+ n = os_read_file_k(fd, c_out, sizeof(*c_out));
if(n == -EAGAIN)
return 0;
@@ -111,7 +111,7 @@ int generic_read(int fd, char *c_out, vo
int generic_write(int fd, const char *buf, int n, void *unused)
{
- return os_write_file(fd, buf, n);
+ return os_write_file_k(fd, buf, n);
}
int generic_window_size(int fd, void *unused, unsigned short *rows_out,
diff -puN arch/um/drivers/cow_sys.h~uml-change-remaining-callers-of-os_read_write_file arch/um/drivers/cow_sys.h
--- a/arch/um/drivers/cow_sys.h~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/drivers/cow_sys.h
@@ -35,7 +35,7 @@ static inline int cow_file_size(char *fi
static inline int cow_write_file(int fd, void *buf, int size)
{
- return(os_write_file(fd, buf, size));
+ return(os_write_file_k(fd, buf, size));
}
#endif
diff -puN arch/um/drivers/net_user.c~uml-change-remaining-callers-of-os_read_write_file arch/um/drivers/net_user.c
--- a/arch/um/drivers/net_user.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/drivers/net_user.c
@@ -73,7 +73,7 @@ void read_output(int fd, char *output, i
while(remain != 0){
expected = (remain < len) ? remain : len;
- ret = os_read_file(fd, output, expected);
+ ret = os_read_file_k(fd, output, expected);
if (ret != expected) {
str = "data";
goto err;
@@ -94,7 +94,7 @@ int net_read(int fd, void *buf, int len)
{
int n;
- n = os_read_file(fd, buf, len);
+ n = os_read_file_k(fd, buf, len);
if(n == -EAGAIN)
return 0;
@@ -122,7 +122,7 @@ int net_write(int fd, void *buf, int len
{
int n;
- n = os_write_file(fd, buf, len);
+ n = os_write_file_k(fd, buf, len);
if(n == -EAGAIN)
return 0;
diff -puN arch/um/drivers/ubd_kern.c~uml-change-remaining-callers-of-os_read_write_file arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/ubd_kern.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/drivers/ubd_kern.c
@@ -1246,7 +1246,7 @@ int read_cow_bitmap(int fd, void *buf, i
if(err < 0)
return(err);
- err = os_read_file(fd, buf, len);
+ err = os_read_file_k(fd, buf, len);
if(err < 0)
return(err);
diff -puN arch/um/kernel/initrd.c~uml-change-remaining-callers-of-os_read_write_file arch/um/kernel/initrd.c
--- a/arch/um/kernel/initrd.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/kernel/initrd.c
@@ -55,7 +55,7 @@ int load_initrd(char *filename, void *bu
printk("Opening '%s' failed - err = %d\n", filename, -fd);
return(-1);
}
- n = os_read_file(fd, buf, size);
+ n = os_read_file_k(fd, buf, size);
if(n != size){
printk("Read of %d bytes from '%s' failed, err = %d\n", size,
filename, -n);
diff -puN arch/um/kernel/physmem.c~uml-change-remaining-callers-of-os_read_write_file arch/um/kernel/physmem.c
--- a/arch/um/kernel/physmem.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/kernel/physmem.c
@@ -211,7 +211,7 @@ void physmem_forget_descriptor(int fd)
panic("physmem_forget_descriptor - failed to seek "
"to %lld in fd %d, error = %d\n",
offset, fd, -err);
- err = os_read_file(fd, addr, PAGE_SIZE);
+ err = os_read_file_k(fd, addr, PAGE_SIZE);
if(err < 0)
panic("physmem_forget_descriptor - failed to read "
"from fd %d to 0x%p, error = %d\n",
diff -puN arch/um/sys-i386/bugs.c~uml-change-remaining-callers-of-os_read_write_file arch/um/sys-i386/bugs.c
--- a/arch/um/sys-i386/bugs.c~uml-change-remaining-callers-of-os_read_write_file
+++ a/arch/um/sys-i386/bugs.c
@@ -28,7 +28,7 @@ static char token(int fd, char *buf, int
ptr = buf;
end = &buf[len];
do {
- n = os_read_file(fd, ptr, sizeof(*ptr));
+ n = os_read_file_k(fd, ptr, sizeof(*ptr));
c = *ptr++;
if(n != sizeof(*ptr)){
if(n == 0)
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-hostfs-style-fixes.patch
uml-an-idle-system-should-have-zero-load-average.patch
remove-tas.patch
x86-create-asm-cmpxchgh.patch
uml-network-and-pcap-cleanup.patch
uml-pcap-devices-should-get-macs-from-command-line.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
