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

Commit 8e0a2181 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: fix hppfs error path 



Fix the error message to refer to the error code, i.e.  err, not count, plus
add some cosmetical fixes.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1c30385a

fs/hppfs/hppfs_kern.c

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static ssize_t read_proc(struct file *file, char *buf, ssize_t count, 
		set_fs(USER_DS);



	if(ppos) *ppos = file->f_pos;

	return(n);

	return n;

}



static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
@@ -254,7 +254,7 @@ static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) 
		err = os_read_file(fd, new_buf, cur);

		if(err < 0){

			printk("hppfs_read : read failed, errno = %d\n",

			       count);

			       err);

			n = err;

			goto out_free;

		}
@@ -271,7 +271,7 @@ static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) 
 out_free:

	kfree(new_buf);

 out:

	return(n);

	return n;

}



static ssize_t hppfs_read(struct file *file, char *buf, size_t count,