diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /fs/read_write.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index e82aaea96..4569ee18a 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -64,17 +64,11 @@ asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin) { off_t retval; struct file * file; - struct dentry * dentry; - struct inode * inode; retval = -EBADF; file = fget(fd); if (!file) goto bad; - /* N.B. Shouldn't this be ENOENT?? */ - if (!(dentry = file->f_dentry) || - !(inode = dentry->d_inode)) - goto out_putf; retval = -EINVAL; if (origin <= 2) { loff_t res = llseek(file, offset, origin); @@ -82,7 +76,6 @@ asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin) if (res != (loff_t)retval) retval = -EOVERFLOW; /* LFS: should only happen on 32 bit platforms */ } -out_putf: fput(file); bad: return retval; @@ -95,18 +88,12 @@ asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, { int retval; struct file * file; - struct dentry * dentry; - struct inode * inode; loff_t offset; retval = -EBADF; file = fget(fd); if (!file) goto bad; - /* N.B. Shouldn't this be ENOENT?? */ - if (!(dentry = file->f_dentry) || - !(inode = dentry->d_inode)) - goto out_putf; retval = -EINVAL; if (origin > 2) goto out_putf; |