On Tue, 24 Jun 2014, Eric Biggers wrote: > Date: Tue, 24 Jun 2014 23:45:08 -0500 > From: Eric Biggers <ebiggers3@xxxxxxxxx> > To: linux-fsdevel@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx, Eric Biggers <ebiggers3@xxxxxxxxx> > Subject: [PATCH] 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"). Oops, good catch, Thanks! Reviewed-by: Lukas Czerner <lczerner@xxxxxxxxxx> > > Signed-off-by: Eric Biggers <ebiggers3@xxxxxxxxx> > --- > fs/open.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/fs/open.c b/fs/open.c > index 36662d0..d6fd3ac 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html