Re: [PATCH] xfstests: fsstress: fix incorrect if condition check for collapse range mode

Lukáš Czerner
2014-04-30T10:26:23Z

On Wed, 30 Apr 2014, Namjae Jeon wrote:

> Date: Wed, 30 Apr 2014 19:11:32 +0900
> From: Namjae Jeon <namjae.jeon@samsung.com>
> To: Dave Chinner <david@fromorbit.com>
> Cc: xfs@oss.sgi.com, linux-fsdevel@vger.kernel.org,
> Ashish Sangwan <a.sangwan@samsung.com>
> Subject: [PATCH] xfstests: fsstress: fix incorrect if condition check for
> collapse range mode
>
> There is if condition to be block aligned for off and len of Collapse range.
> But off and len for all fallocate opearion can be aligned by incorrect
> if condition check.
>
> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
> Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
> ---
> ltp/fsstress.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ltp/fsstress.c b/ltp/fsstress.c
> index 29fc250..ff9ed12 100644
> --- a/ltp/fsstress.c
> +++ b/ltp/fsstress.c
> @@ -2230,7 +2230,7 @@ do_fallocate(int opno, long r, int mode)
> * Collapse range requires off and len to be block aligned, make it
> * more likely to be the case.
> */
> - if (FALLOC_FL_COLLAPSE_RANGE && (opno % 2)) {
> + if (mode & FALLOC_FL_COLLAPSE_RANGE && (opno % 2)) {
> off = ((off + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
> len = ((len + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
> }

oops :). Thanks for fixing it. Even though it would be better to use
parentheses

+ if ((mode & FALLOC_FL_COLLAPSE_RANGE) && (opno % 2)) {

Reviewed-by: Lukas Czerner <lczerner@redhat.com>