btrfs: remove pointless and double ulist frees in error paths of qgroup tests

[platform/kernel/linux-rpi.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index 3abcd7f..5dbce4d 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -814,15 +814,17 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 {
        struct pipe_inode_info *pipe;
        long ret, bytes;
+       umode_t i_mode;
        size_t len;
        int i, flags, more;
 
        /*
-        * We require the input to be seekable, as we don't want to randomly
-        * drop data for eg socket -> socket splicing. Use the piped splicing
-        * for that!
+        * We require the input being a regular file, as we don't want to
+        * randomly drop data for eg socket -> socket splicing. Use the
+        * piped splicing for that!
         */
-       if (unlikely(!(in->f_mode & FMODE_LSEEK)))
+       i_mode = file_inode(in)->i_mode;
+       if (unlikely(!S_ISREG(i_mode) && !S_ISBLK(i_mode)))
                return -EINVAL;
 
        /*