diff options
| author | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-09-24 13:31:00 -0400 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-09-24 13:31:00 -0400 |
| commit | 524b6ab3afde7bb566bef72536f6ad9fe227bf90 (patch) | |
| tree | 6ec4fb6a43b1343ef82391073c809aeb0d784993 /fs/exec.c | |
| parent | 7f012496acc68bbd577c6ab1c253ad0b498f2333 (diff) | |
| parent | e828d70905ec36f915f98de213e0abe8a64dc3bf (diff) | |
Merge toomuch.toronto.redhat.com:/md0/linux-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 0d0b2569b65a..b76f0a1b55f4 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); @@ -452,19 +452,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; } |