diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 16:27:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:54 -0400 |
commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/splice.c | |
parent | 22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff) |
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/splice.c b/fs/splice.c index 3b7ee656f3aa..46a08f772d7d 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -695,7 +695,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe, | |||
695 | loff_t pos = sd->pos; | 695 | loff_t pos = sd->pos; |
696 | int more; | 696 | int more; |
697 | 697 | ||
698 | if (!likely(file->f_op && file->f_op->sendpage)) | 698 | if (!likely(file->f_op->sendpage)) |
699 | return -EINVAL; | 699 | return -EINVAL; |
700 | 700 | ||
701 | more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0; | 701 | 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, | |||
1099 | ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, | 1099 | ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, |
1100 | loff_t *, size_t, unsigned int); | 1100 | loff_t *, size_t, unsigned int); |
1101 | 1101 | ||
1102 | if (out->f_op && out->f_op->splice_write) | 1102 | if (out->f_op->splice_write) |
1103 | splice_write = out->f_op->splice_write; | 1103 | splice_write = out->f_op->splice_write; |
1104 | else | 1104 | else |
1105 | splice_write = default_file_splice_write; | 1105 | splice_write = default_file_splice_write; |
@@ -1125,7 +1125,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, | |||
1125 | if (unlikely(ret < 0)) | 1125 | if (unlikely(ret < 0)) |
1126 | return ret; | 1126 | return ret; |
1127 | 1127 | ||
1128 | if (in->f_op && in->f_op->splice_read) | 1128 | if (in->f_op->splice_read) |
1129 | splice_read = in->f_op->splice_read; | 1129 | splice_read = in->f_op->splice_read; |
1130 | else | 1130 | else |
1131 | splice_read = default_file_splice_read; | 1131 | splice_read = default_file_splice_read; |