[PATCH 3.15 34/42] vfs: fix check for fallocate on active swapfile

3.15-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Biggers <redacted>

commit 6d2b6170c8914c6c69256b687651fb16d7ec3e18 upstream.

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 <redacted>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/open.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/fs/open.c
+++ b/fs/open.c

@@ -263,11 +263,10 @@ int do_fallocate(struct file *file, int
 		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