diff --git a/[refs] b/[refs] index 989a48da0acf..349c0b090334 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cb4b05e7647891b46b91c07c9a60304803d1688 +refs/heads/master: 19c9a49b432f245c6293508d164a4350f1f2c601 diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 41900496d3bb..efdbfece9932 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -1372,8 +1372,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, if (off_in) return -ESPIPE; if (off_out) { - if (!out->f_op || !out->f_op->llseek || - out->f_op->llseek == no_llseek) + if (!(out->f_mode & FMODE_PWRITE)) return -EINVAL; if (copy_from_user(&offset, off_out, sizeof(loff_t))) return -EFAULT; @@ -1393,8 +1392,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, if (off_out) return -ESPIPE; if (off_in) { - if (!in->f_op || !in->f_op->llseek || - in->f_op->llseek == no_llseek) + if (!(in->f_mode & FMODE_PREAD)) return -EINVAL; if (copy_from_user(&offset, off_in, sizeof(loff_t))) return -EFAULT;