|
@@ -257,7 +257,7 @@ loff_t vfs_llseek(struct file *file, loff_t offset, int whence)
|
|
|
|
|
|
fn = no_llseek;
|
|
|
if (file->f_mode & FMODE_LSEEK) {
|
|
|
- if (file->f_op && file->f_op->llseek)
|
|
|
+ if (file->f_op->llseek)
|
|
|
fn = file->f_op->llseek;
|
|
|
}
|
|
|
return fn(file, offset, whence);
|
|
@@ -384,7 +384,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
|
|
|
|
|
if (!(file->f_mode & FMODE_READ))
|
|
|
return -EBADF;
|
|
|
- if (!file->f_op || (!file->f_op->read && !file->f_op->aio_read))
|
|
|
+ if (!file->f_op->read && !file->f_op->aio_read)
|
|
|
return -EINVAL;
|
|
|
if (unlikely(!access_ok(VERIFY_WRITE, buf, count)))
|
|
|
return -EFAULT;
|
|
@@ -433,7 +433,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
|
|
|
const char __user *p;
|
|
|
ssize_t ret;
|
|
|
|
|
|
- if (!file->f_op || (!file->f_op->write && !file->f_op->aio_write))
|
|
|
+ if (!file->f_op->write && !file->f_op->aio_write)
|
|
|
return -EINVAL;
|
|
|
|
|
|
old_fs = get_fs();
|
|
@@ -460,7 +460,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
|
|
|
|
|
|
if (!(file->f_mode & FMODE_WRITE))
|
|
|
return -EBADF;
|
|
|
- if (!file->f_op || (!file->f_op->write && !file->f_op->aio_write))
|
|
|
+ if (!file->f_op->write && !file->f_op->aio_write)
|
|
|
return -EINVAL;
|
|
|
if (unlikely(!access_ok(VERIFY_READ, buf, count)))
|
|
|
return -EFAULT;
|
|
@@ -727,11 +727,6 @@ static ssize_t do_readv_writev(int type, struct file *file,
|
|
|
io_fn_t fn;
|
|
|
iov_fn_t fnv;
|
|
|
|
|
|
- if (!file->f_op) {
|
|
|
- ret = -EINVAL;
|
|
|
- goto out;
|
|
|
- }
|
|
|
-
|
|
|
ret = rw_copy_check_uvector(type, uvector, nr_segs,
|
|
|
ARRAY_SIZE(iovstack), iovstack, &iov);
|
|
|
if (ret <= 0)
|
|
@@ -778,7 +773,7 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,
|
|
|
{
|
|
|
if (!(file->f_mode & FMODE_READ))
|
|
|
return -EBADF;
|
|
|
- if (!file->f_op || (!file->f_op->aio_read && !file->f_op->read))
|
|
|
+ if (!file->f_op->aio_read && !file->f_op->read)
|
|
|
return -EINVAL;
|
|
|
|
|
|
return do_readv_writev(READ, file, vec, vlen, pos);
|
|
@@ -791,7 +786,7 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
|
|
|
{
|
|
|
if (!(file->f_mode & FMODE_WRITE))
|
|
|
return -EBADF;
|
|
|
- if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
|
|
|
+ if (!file->f_op->aio_write && !file->f_op->write)
|
|
|
return -EINVAL;
|
|
|
|
|
|
return do_readv_writev(WRITE, file, vec, vlen, pos);
|
|
@@ -906,10 +901,6 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
|
|
|
io_fn_t fn;
|
|
|
iov_fn_t fnv;
|
|
|
|
|
|
- ret = -EINVAL;
|
|
|
- if (!file->f_op)
|
|
|
- goto out;
|
|
|
-
|
|
|
ret = -EFAULT;
|
|
|
if (!access_ok(VERIFY_READ, uvector, nr_segs*sizeof(*uvector)))
|
|
|
goto out;
|
|
@@ -965,7 +956,7 @@ static size_t compat_readv(struct file *file,
|
|
|
goto out;
|
|
|
|
|
|
ret = -EINVAL;
|
|
|
- if (!file->f_op || (!file->f_op->aio_read && !file->f_op->read))
|
|
|
+ if (!file->f_op->aio_read && !file->f_op->read)
|
|
|
goto out;
|
|
|
|
|
|
ret = compat_do_readv_writev(READ, file, vec, vlen, pos);
|
|
@@ -1032,7 +1023,7 @@ static size_t compat_writev(struct file *file,
|
|
|
goto out;
|
|
|
|
|
|
ret = -EINVAL;
|
|
|
- if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
|
|
|
+ if (!file->f_op->aio_write && !file->f_op->write)
|
|
|
goto out;
|
|
|
|
|
|
ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos);
|