lkml.org 
[lkml]   [2014]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] vfs: fix check for fallocate on active swapfile
On Tue, 24 Jun 2014, Eric Biggers wrote:

> Date: Tue, 24 Jun 2014 23:45:08 -0500
> From: Eric Biggers <ebiggers3@gmail.com>
> To: linux-fsdevel@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org, Eric Biggers <ebiggers3@gmail.com>
> 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@redhat.com>

>
> Signed-off-by: Eric Biggers <ebiggers3@gmail.com>
> ---
> 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
>


\
 
 \ /
  Last update: 2014-06-25 11:41    [W:0.035 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site