diff options
| author | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-10-03 06:29:09 -0400 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-10-03 06:29:09 -0400 |
| commit | d97a03f2fdd7a9e4b3614b5df6541c06e10620e8 (patch) | |
| tree | b1e59dc7e74a6a75a7569795c9955c7d5ff7bbf6 /fs/exec.c | |
| parent | 45ecad2eee276028655b96e70514211a8e2d7f7f (diff) | |
| parent | 7b6f3552de2dc26e79f967188c2b98e1fd475053 (diff) | |
Merge toomuch.toronto.redhat.com:/md0/linus-2.5
into toomuch.toronto.redhat.com:/md0/aio-2.5
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/exec.c b/fs/exec.c index 4f51a01d74cf..710e57e589fd 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -131,7 +131,7 @@ asmlinkage long sys_uselib(const char * library) goto out; error = -ENOEXEC; - if(file->f_op && file->f_op->read) { + if(file->f_op) { struct linux_binfmt * fmt; read_lock(&binfmt_lock); @@ -453,19 +453,16 @@ out: } int kernel_read(struct file *file, unsigned long offset, - char * addr, unsigned long count) + char *addr, unsigned long count) { mm_segment_t old_fs; loff_t pos = offset; - int result = -ENOSYS; + int result; - if (!file->f_op->read) - goto fail; old_fs = get_fs(); set_fs(get_ds()); - result = file->f_op->read(file, addr, count, &pos); + result = vfs_read(file, addr, count, &pos); set_fs(old_fs); -fail: return result; } |