diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-07-14 03:33:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-14 12:00:25 -0400 |
commit | 8e0a21812427313f8ee8521688e81bfcc6f207a2 (patch) | |
tree | 356769be4834e02ce77850329896fe35dc2e4c1e /fs/hppfs/hppfs_kern.c | |
parent | 1c30385ae479ec4774bdc1048726aeb15cde0d21 (diff) |
[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: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/hppfs/hppfs_kern.c')
-rw-r--r-- | fs/hppfs/hppfs_kern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index 6f553e17c375..ff150fedb981 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
@@ -233,7 +233,7 @@ static ssize_t read_proc(struct file *file, char *buf, ssize_t count, | |||
233 | set_fs(USER_DS); | 233 | set_fs(USER_DS); |
234 | 234 | ||
235 | if(ppos) *ppos = file->f_pos; | 235 | if(ppos) *ppos = file->f_pos; |
236 | return(n); | 236 | return n; |
237 | } | 237 | } |
238 | 238 | ||
239 | static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) | 239 | 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) | |||
254 | err = os_read_file(fd, new_buf, cur); | 254 | err = os_read_file(fd, new_buf, cur); |
255 | if(err < 0){ | 255 | if(err < 0){ |
256 | printk("hppfs_read : read failed, errno = %d\n", | 256 | printk("hppfs_read : read failed, errno = %d\n", |
257 | count); | 257 | err); |
258 | n = err; | 258 | n = err; |
259 | goto out_free; | 259 | goto out_free; |
260 | } | 260 | } |
@@ -271,7 +271,7 @@ static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) | |||
271 | out_free: | 271 | out_free: |
272 | kfree(new_buf); | 272 | kfree(new_buf); |
273 | out: | 273 | out: |
274 | return(n); | 274 | return n; |
275 | } | 275 | } |
276 | 276 | ||
277 | static ssize_t hppfs_read(struct file *file, char *buf, size_t count, | 277 | static ssize_t hppfs_read(struct file *file, char *buf, size_t count, |