aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers3@gmail.com>2014-06-24 23:45:08 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-08-01 02:36:04 -0400
commit6d2b6170c8914c6c69256b687651fb16d7ec3e18 (patch)
treef3a2cb3335d8497e4cebcb2b3ab2291c6d1308db
parentaf436472772d474acfad724ce789e003d1ca41c3 (diff)
downloadlinux-6d2b6170c8914c6c69256b687651fb16d7ec3e18.tar.gz
vfs: fix check for fallocate on active swapfile
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>
-rw-r--r--fs/open.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/open.c b/fs/open.c
index 36662d03623..d6fd3acde13 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