erofs-utils: use cmpsgn(x, y) for standardized large value comparsion
PATCH 1/1 erofs-utils: use cmpsgn(x, y) for standardized large value comparsion
Previously, roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is a unsigned 64bit value and sgn(x) didn't work properly. Fix it.
--- include/erofs/defs.h | 5 +++-- lib/cache.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)
include/erofs/defs.h +3 -2
@@ -136,9 +136,10 @@ typedef int64_t s64;type __max2 = (y); \ __max1 > __max2 ? __max1: __max2; }) -#define sgn (x) ({ \ +#define cmpsgn (x, y) ({ \ typeof(x) _x = (x); \ -(_x > 0) - (_x < 0); }) + typeof(y) _y = (y); \ +(_x > _y) - (_x < _y); })#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0]))
lib/cache.c +3 -3
@@ -80,9 +80,9 @@ static int __erofs_battach(struct erofs_buffer_block *bb, bool dryrun) {const erofs_off_t alignedoffset =roundup (bb->buffers.off, alignsize); -const int oob =sgn (roundup (bb->buffers.off %EROFS_BLKSIZ , - alignsize) + incr + extrasize - -EROFS_BLKSIZ ); +const int oob =cmpsgn (roundup (bb->buffers.off %EROFS_BLKSIZ , + alignsize) + incr + extrasize, +EROFS_BLKSIZ );bool tailupdate = false;erofs_blk_t blkaddr;
Signature · 1 line
2.17.1
Quoted 3 lines · Gao Xiang
Previously,
roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is a unsigned 64bit value and sgn(x) didn't work properly. Fix it.
Update commit message:
erofs-utils: use cmpsgn(x, y) for standardized large value comparsion
Previously, roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is an unsigned 64bit value and sgn(x) didn't work properly. Fix it.
Guifu, do you have time reviewing and testing those patches? I'd like to release erofs-utils 1.0 for upstreaming AOSP these days...
Thanks,
Gao Xiang
Quoted 44 lines
Signed-off-by Gao Xiang <[email protected]>--- include/erofs/defs.h | 5 +++-- lib/cache.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)include/erofs/defs.h +3
-2@@ -136,9 +136,10 @@ typedef int64_t s64;type __max2 = (y); \ __max1 > __max2 ? __max1: __max2; }) -#define sgn (x) ({ \ +#define cmpsgn (x, y) ({ \ typeof(x) _x = (x); \ -(_x > 0) - (_x < 0); }) + typeof(y) _y = (y); \ +(_x > _y) - (_x < _y); })#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0]))lib/cache.c +3
-3@@ -80,9 +80,9 @@ static int __erofs_battach(struct erofs_buffer_block *bb, bool dryrun) {const erofs_off_t alignedoffset =roundup (bb->buffers.off, alignsize); -const int oob =sgn (roundup (bb->buffers.off %EROFS_BLKSIZ , - alignsize) + incr + extrasize - -EROFS_BLKSIZ ); +const int oob =cmpsgn (roundup (bb->buffers.off %EROFS_BLKSIZ , + alignsize) + incr + extrasize, +EROFS_BLKSIZ );bool tailupdate = false;erofs_blk_t blkaddr;Signature · 1 line
2.17.1
Hi Gao Xiang,
It runs ok, but could you resend it to adjust line algin ?
Quoted 73 lines
Quoted 6 lines
include/erofs/defs.h +3
-2-#define sgn (x) ({ \ +#define cmpsgn (x, y) ({ \ typeof(x) _x = (x); \ -(_x > 0) - (_x < 0); }) + typeof(y) _y = (y); \ +(_x > _y) - (_x < _y); }) ----> hereQuoted 3 lines · Gao Xiang
Previously,
roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is a unsigned 64bit value and sgn(x) didn't work properly. Fix it.Update commit message:
erofs-utils: use
cmpsgn(x, y)for standardized large value comparsionPreviously,
roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is an unsigned 64bit value and sgn(x) didn't work properly. Fix it.Fixes b0ca535297b6 ("erofs-utils: support 64-bit internal buffer cache")Guifu, do you have time reviewing and testing those patches? I'd like to release erofs-utils 1.0 for upstreaming AOSP these days...
Thanks,
Gao XiangQuoted 44 lines
Signed-off-by Gao Xiang <[email protected]>--- include/erofs/defs.h | 5 +++-- lib/cache.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)include/erofs/defs.h +3
-2@@ -136,9 +136,10 @@ typedef int64_t s64;type __max2 = (y); \ __max1 > __max2 ? __max1: __max2; }) -#define sgn (x) ({ \ +#define cmpsgn (x, y) ({ \ typeof(x) _x = (x); \ -(_x > 0) - (_x < 0); }) + typeof(y) _y = (y); \ +(_x > _y) - (_x < _y); })#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0]))lib/cache.c +3
-3@@ -80,9 +80,9 @@ static int __erofs_battach(struct erofs_buffer_block *bb, bool dryrun) {const erofs_off_t alignedoffset =roundup (bb->buffers.off, alignsize); -const int oob =sgn (roundup (bb->buffers.off %EROFS_BLKSIZ , - alignsize) + incr + extrasize - -EROFS_BLKSIZ ); +const int oob =cmpsgn (roundup (bb->buffers.off %EROFS_BLKSIZ , + alignsize) + incr + extrasize, +EROFS_BLKSIZ );bool tailupdate = false;erofs_blk_t blkaddr;Signature · 1 line
2.17.1
PATCH v3 1/1 erofs-utils: use cmpsgn(x, y) for standardized large value comparsion
Previously, roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is an unsigned 64bit value and sgn(x) didn't work properly. Fix it.
---
change since v2:
- update an indention suggested by Guifu.
include/erofs/defs.h | 5 +++-- lib/cache.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)
include/erofs/defs.h +3 -2
@@ -136,9 +136,10 @@ typedef int64_t s64;type __max2 = (y); \ __max1 > __max2 ? __max1: __max2; }) -#define sgn (x) ({ \ +#define cmpsgn (x, y) ({ \ typeof(x) _x = (x); \ -(_x > 0) - (_x < 0); }) + typeof(y) _y = (y); \ + (_x > _y) - (_x < _y); })#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0]))
lib/cache.c +3 -3
@@ -80,9 +80,9 @@ static int __erofs_battach(struct erofs_buffer_block *bb, bool dryrun) {const erofs_off_t alignedoffset =roundup (bb->buffers.off, alignsize); -const int oob =sgn (roundup (bb->buffers.off %EROFS_BLKSIZ , - alignsize) + incr + extrasize - -EROFS_BLKSIZ ); +const int oob =cmpsgn (roundup (bb->buffers.off %EROFS_BLKSIZ , + alignsize) + incr + extrasize, +EROFS_BLKSIZ );bool tailupdate = false;erofs_blk_t blkaddr;
Signature · 1 line
2.17.1
Quoted 8 lines
Previously,
roundup(bb->buffers.off % EROFS_BLKSIZ, alignsize)
+ incr + extrasize is an unsigned 64bit value and sgn(x) didn't work properly. Fix it.Fixes b0ca535297b6 ("erofs-utils: support 64-bit internal buffer cache")Signed-off-by Gao Xiang <[email protected]>---
It looks good
Thanks,