Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "This contains a couple of fixes - one is the aio fix from Christoph,
  the other a fallocate() one from Eric"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: fix check for fallocate on active swapfile
  direct-io: fix AIO regression

2 files changed, 6 insertions, 8 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 194d0d122cae..17e39b047de5 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -71,7 +71,6 @@ struct dio_submit {
                                            been performed at the start of a
                                            write */
         int pages_in_io;                /* approximate total IO pages */
-        size_t  size;                   /* total request size (doesn't change)*/
         sector_t block_in_file;         /* Current offset into the underlying
                                            file in dio_block units. */
         unsigned blocks_available;      /* At block_in_file.  changes */
@@ -1104,7 +1103,8 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         unsigned blkbits = i_blkbits;
         unsigned blocksize_mask = (1 << blkbits) - 1;
         ssize_t retval = -EINVAL;
-        loff_t end = offset + iov_iter_count(iter);
+        size_t count = iov_iter_count(iter);
+        loff_t end = offset + count;
         struct dio *dio;
         struct dio_submit sdio = { 0, };
         struct buffer_head map_bh = { 0, };
@@ -1287,10 +1287,9 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
          */
         BUG_ON(retval == -EIOCBQUEUED);
         if (dio->is_async && retval == 0 && dio->result &&
-            ((rw == READ) || (dio->result == sdio.size)))
+            (rw == READ || dio->result == count))
                 retval = -EIOCBQUEUED;
-
-        if (retval != -EIOCBQUEUED)
+        else
                 dio_await_completion(dio);
 
         if (drop_refcount(dio) == 0) {
diff --git a/fs/open.c b/fs/open.c
index 36662d036237..d6fd3acde134 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -263,11 +263,10 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
                 return -EPERM;
 
         /*
-         * We can not allow to do any fallocate operation on an active
-         * swapfile
+         * We cannot allow any fallocate operation on an active swapfile
          */
         if (IS_SWAPFILE(inode))
-                ret = -ETXTBSY;
+                return -ETXTBSY;
 
         /*
          * Revalidate the write permissions, in case security policy has