]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
vfs: fix check for fallocate on active swapfile
authorEric Biggers <ebiggers3@gmail.com>
Wed, 25 Jun 2014 04:45:08 +0000 (23:45 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 1 Aug 2014 06:36:04 +0000 (02:36 -0400)
Fix the broken check for calling sys_fallocate() on an active swapfile,
introduced by commit 0790b31b69374ddadefe ("fs: disallow all fallocate
operation on active swapfile").

Signed-off-by: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/open.c

index 36662d0362379698fcb5764fbb142337732b3919..d6fd3acde134d9669391cd064960790dea586042 100644 (file)
--- 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