Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fda83a99 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: change remaining callers of os_{read_write}_file 



Convert all remaining os_{read_write}_file users to use the simple
{read,write} wrappers, os_{read_write}_file_k.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77f6af77

arch/um/drivers/chan_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int generic_read(int fd, char *c_out, void *unused) 
{

	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, void *unused) 


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,

arch/um/drivers/cow_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline int cow_file_size(char *file, unsigned long long *size_out) 


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

arch/um/drivers/net_user.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void read_output(int fd, char *output, int len) 


	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;

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ int read_cow_bitmap(int fd, void *buf, int offset, int len) 
	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);

arch/um/kernel/initrd.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int load_initrd(char *filename, void *buf, int size) 
		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);