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

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

uml: rename os_{read_write}_file_k back to os_{read_write}_file 



Rename os_{read_write}_file_k back to os_{read_write}_file, delete
the originals and their bogus infrastructure, and fix all the callers.

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 a2636724

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_k(fd, c_out, sizeof(*c_out));

	n = os_read_file(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_k(fd, buf, n);

	return os_write_file(fd, buf, n);

}



int generic_window_size(int fd, void *unused, unsigned short *rows_out,

arch/um/drivers/chan_user.c

+5 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int winch_thread(void *arg) 


	pty_fd = data->pty_fd;

	pipe_fd = data->pipe_fd;

	count = os_write_file_k(pipe_fd, &c, sizeof(c));

	count = os_write_file(pipe_fd, &c, sizeof(c));

	if(count != sizeof(c))

		printk("winch_thread : failed to write synchronization "

		       "byte, err = %d\n", -count);
@@ -120,7 +120,7 @@ static int winch_thread(void *arg) 
	 * host - since they are not different kernel threads, we cannot use

	 * kernel semaphores. We don't use SysV semaphores because they are

	 * persistent. */

	count = os_read_file_k(pipe_fd, &c, sizeof(c));

	count = os_read_file(pipe_fd, &c, sizeof(c));

	if(count != sizeof(c))

		printk("winch_thread : failed to read synchronization byte, "

		       "err = %d\n", -count);
@@ -130,7 +130,7 @@ static int winch_thread(void *arg) 
		 * are blocked.*/

		sigsuspend(&sigs);



		count = os_write_file_k(pipe_fd, &c, sizeof(c));

		count = os_write_file(pipe_fd, &c, sizeof(c));

		if(count != sizeof(c))

			printk("winch_thread : write failed, err = %d\n",

			       -count);
@@ -162,7 +162,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out) 
	}



	*fd_out = fds[0];

	n = os_read_file_k(fds[0], &c, sizeof(c));

	n = os_read_file(fds[0], &c, sizeof(c));

	if(n != sizeof(c)){

		printk("winch_tramp : failed to read synchronization byte\n");

		printk("read failed, err = %d\n", -n);
@@ -195,7 +195,7 @@ void register_winch(int fd, struct tty_struct *tty) 
		if(thread > 0){

			register_winch_irq(thread_fd, fd, thread, tty);



			count = os_write_file_k(thread_fd, &c, sizeof(c));

			count = os_write_file(thread_fd, &c, sizeof(c));

			if(count != sizeof(c))

				printk("register_winch : failed to write "

				       "synchronization byte, err = %d\n",

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_k(fd, buf, size);

	return os_write_file(fd, buf, size);

}



#endif

arch/um/drivers/daemon_user.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int connect_to_switch(struct daemon_data *pri) 
	req.version = SWITCH_VERSION;

	req.type = REQ_NEW_CONTROL;

	req.sock = *local_addr;

	n = os_write_file_k(pri->control, &req, sizeof(req));

	n = os_write_file(pri->control, &req, sizeof(req));

	if(n != sizeof(req)){

		printk("daemon_open : control setup request failed, err = %d\n",

		       -n);
@@ -102,7 +102,7 @@ static int connect_to_switch(struct daemon_data *pri) 
		goto out_free;

	}



	n = os_read_file_k(pri->control, sun, sizeof(*sun));

	n = os_read_file(pri->control, sun, sizeof(*sun));

	if(n != sizeof(*sun)){

		printk("daemon_open : read of data socket failed, err = %d\n",

		       -n);

arch/um/drivers/harddog_user.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) 
		goto out_close_out;

	}



	n = os_read_file_k(in_fds[0], &c, sizeof(c));

	n = os_read_file(in_fds[0], &c, sizeof(c));

	if(n == 0){

		printk("harddog_open - EOF on watchdog pipe\n");

		helper_wait(pid);
@@ -118,7 +118,7 @@ int ping_watchdog(int fd) 
	int n;

	char c = '\n';



	n = os_write_file_k(fd, &c, sizeof(c));

	n = os_write_file(fd, &c, sizeof(c));

	if(n != sizeof(c)){

		printk("ping_watchdog - write failed, err = %d\n", -n);

		if(n < 0)