xfs: remove redundant assignment of ifp

[cascardo/linux.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index 8aeb08b..d3ed817 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -267,6 +267,11 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
            (mode & ~FALLOC_FL_INSERT_RANGE))
                return -EINVAL;
 
+       /* Unshare range should only be used with allocate mode. */
+       if ((mode & FALLOC_FL_UNSHARE_RANGE) &&
+           (mode & ~(FALLOC_FL_UNSHARE_RANGE | FALLOC_FL_KEEP_SIZE)))
+               return -EINVAL;
+
        if (!(file->f_mode & FMODE_WRITE))
                return -EBADF;
 
@@ -300,7 +305,8 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
         * Let individual file system decide if it supports preallocation
         * for directories or not.
         */
-       if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
+       if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode) &&
+           !S_ISBLK(inode->i_mode))
                return -ENODEV;
 
        /* Check for wrap through zero too */