xfstests: fsstress: fix incorrect if condition check for collapse range mode
PATCH 1/1 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.
--- ltp/fsstress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ltp/fsstress.c +1 -1
@@ -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 )); }
Signature · 1 line
1.7.11-rc0
Quoted 23 lines · Namjae Jeon
Date: Wed, 30 Apr 2014 19:11:32 +0900
From: Namjae Jeon <[email protected]>
To: Dave Chinner <[email protected]>
Cc: [email protected], [email protected],
Ashish Sangwan <[email protected]>
Subject: [PATCH] xfstests: fsstress: fix incorrect if condition check for
collapse range modeThere 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 <[email protected]>Signed-off-by Ashish Sangwan <[email protected]>--- ltp/fsstress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)ltp/fsstress.c +0
-0
ltp/fsstress.c do_fallocate(int opno, long r, int mode) · line 2236
Quoted 8 lines
ltp/fsstress.c +1
-1@@ -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)) {
Quoted 20 lines · Namjae Jeon
Quoted 19 lines
Date: Wed, 30 Apr 2014 19:11:32 +0900
From: Namjae Jeon <[email protected]>
To: Dave Chinner <[email protected]>
Cc: [email protected], [email protected],
Ashish Sangwan <[email protected]>
Subject: [PATCH] xfstests: fsstress: fix incorrect if condition check for
collapse range modeThere 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 <[email protected]>Signed-off-by Ashish Sangwan <[email protected]>--- ltp/fsstress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
ltp/fsstress.c do_fallocate(int opno, long r, int mode) · line 2236
Quoted 13 lines
ltp/fsstress.c +1
-1@@ -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
Hi Lukas.
Okay, I will send v2 patch.
Thanks for review!
Quoted 4 lines
(quoted diff) +1
-0+ if ((mode & FALLOC_FL_COLLAPSE_RANGE) && (opno % 2)) {Reviewed-by Lukas Czerner <[email protected]>
Quoted 20 lines · Namjae Jeon
Quoted 19 lines
Date: Wed, 30 Apr 2014 19:11:32 +0900
From: Namjae Jeon <[email protected]>
To: Dave Chinner <[email protected]>
Cc: [email protected], [email protected],
Ashish Sangwan <[email protected]>
Subject: [PATCH] xfstests: fsstress: fix incorrect if condition check for
collapse range modeThere 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 <[email protected]>Signed-off-by Ashish Sangwan <[email protected]>--- ltp/fsstress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
ltp/fsstress.c do_fallocate(int opno, long r, int mode) · line 2236
Quoted 13 lines
ltp/fsstress.c +1
-1@@ -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
Hi Lukas.
Okay, I will send v2 patch.
Thanks for review!
Quoted 4 lines
(quoted diff) +1
-0+ if ((mode & FALLOC_FL_COLLAPSE_RANGE) && (opno % 2)) {Reviewed-by Lukas Czerner <[email protected]>
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs