file->f_op is never NULL...

[people/ms/linux.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index 3b7ee656f3aaeacd719955b2bba80fd5d8d43b0a..46a08f772d7dbf5db1c931d479ad86e8405d323a 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -695,7 +695,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
        loff_t pos = sd->pos;
        int more;
 
-       if (!likely(file->f_op && file->f_op->sendpage))
+       if (!likely(file->f_op->sendpage))
                return -EINVAL;
 
        more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
@@ -1099,7 +1099,7 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
                                loff_t *, size_t, unsigned int);
 
-       if (out->f_op && out->f_op->splice_write)
+       if (out->f_op->splice_write)
                splice_write = out->f_op->splice_write;
        else
                splice_write = default_file_splice_write;
@@ -1125,7 +1125,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
        if (unlikely(ret < 0))
                return ret;
 
-       if (in->f_op && in->f_op->splice_read)
+       if (in->f_op->splice_read)
                splice_read = in->f_op->splice_read;
        else
                splice_read = default_file_splice_read;