fs/ntfs: Use '%tx' instead of '%zx'
PATCH 1/1 fs/ntfs: Use '%tx' instead of '%zx'
For subtraction between 2 pointers, the result's type is 'ptrdiff_t', so need use '%tx' instead of '%zx'.
The related warning (allmodconfig under unicore32):
CC [M] fs/ntfs/compress.o
fs/ntfs/compress.c: In function 'ntfs_decompress':
fs/ntfs/compress.c:207:2: warning: format '%zx' expects argument of type 'size_t', but argument 5 has type 'long int' [-Wformat=]
ntfs_debug("Beginning sub-block at offset = 0x%zx in the cb.",
^
CC [M] fs/ntfs/dir.o
fs/ntfs/dir.c: In function 'ntfs_readdir':
fs/ntfs/dir.c:1197:3: warning: format '%zx' expects argument of type 'size_t', but argument 5 has type 'long int' [-Wformat=]
ntfs_debug("In index root, offset 0x%zx.", (u8*)ie - (u8*)ir);
^Also let the related code match linux kernel styles which is found by 'scripts/checkpatch.pl'.
--- fs/ntfs/compress.c | 2 +- fs/ntfs/dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/ntfs/compress.c +1 -1
@@ -204,7 +204,7 @@ static int ntfs_decompress(struct page *dest_pages[], int *dest_index,ntfs_debug ("Entering, cb_size = 0x%x." , cb_size); do_next_sb: -ntfs_debug ("Beginning sub-block at offset = 0x%zx in the cb." , +ntfs_debug ("Beginning sub-block at offset = 0x%tx in the cb." , cb - cb_start);/* * Have we reached the end of the compression block or the end of the
fs/ntfs/dir.c +1 -1
@@ -1194,7 +1194,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)* or signals an error (both covered by the rc test). */ for (;; ie = (INDEX_ENTRY *)((u8 *)ie +le16_to_cpu (ie->length))) { -ntfs_debug ("In index root, offset 0x%zx." , (u8 *)ie - (u8 *)ir); +ntfs_debug ("In index root, offset 0x%tx." , (u8 *)ie - (u8 *)ir);/* Bounds checks. */ if (unlikely((u8*)ie < (u8*)ir || (u8*)ie + sizeof(INDEX_ENTRY_HEADER) > index_end ||
Signature · 1 line
1.9.2.459.g68773ac
Please make sure to cc the specific maintainer
$ ./scripts/get_maintainer.pl -f fs/ntfs/ Anton Altaparmakov <[email protected]> (supporter:NTFS FILESYSTEM) [email protected] (open list:NTFS FILESYSTEM) [email protected] (open list)
(cc'ing Anton)
btw Anton, it seems ntfs_debug does not terminate
messages with a "\n". That means that messages
could be interleaved with other output.
Maybe this patch as well as Chen Gang's below should be applied
--- fs/ntfs/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ntfs/debug.c +2 -1
@@ -126,7 +126,8 @@ void __ntfs_debug (const char *file, int line, const char *function,va_start (args, fmt); vaf.fmt = fmt; vaf.va = &args; -pr_debug ("(%s, %d): %s(): %pV" , file, line, flen ? function :"" , &vaf); +pr_debug ("(%s, %d): %s(): %pV\n" , + file, line, flen ? function :"" , &vaf);va_end (args); }
Quoted 52 lines · Chen Gang
For subtraction between 2 pointers, the result's type is '
ptrdiff_t', so need use '%tx' instead of '%zx'.The related warning (allmodconfig under unicore32):
CC [M]
fs/ntfs/compress.o
fs/ntfs/compress.c: In function 'ntfs_decompress':
fs/ntfs/compress.c:207:2: warning: format '%zx' expects argument of type 'size_t', but argument 5 has type 'long int' [-Wformat=]ntfs_debug("Beginning sub-block at offset = 0x%zx in the cb.", ^ CC [M] fs/ntfs/dir.o fs/ntfs/dir.c: In function 'ntfs_readdir': fs/ntfs/dir.c:1197:3: warning: format '%zx' expects argument of type 'size_t', but argument 5 has type 'long int' [-Wformat=] ntfs_debug("In index root, offset 0x%zx.", (u8*)ie - (u8*)ir); ^Also let the related code match linux kernel styles which is found by '
scripts/checkpatch.pl'.Signed-off-by Chen Gang <[email protected]>--- fs/ntfs/compress.c | 2 +- fs/ntfs/dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)fs/ntfs/compress.c +1
-1@@ -204,7 +204,7 @@ static int ntfs_decompress(struct page *dest_pages[], int *dest_index,ntfs_debug ("Entering, cb_size = 0x%x." , cb_size); do_next_sb: -ntfs_debug ("Beginning sub-block at offset = 0x%zx in the cb." , +ntfs_debug ("Beginning sub-block at offset = 0x%tx in the cb." , cb - cb_start);/* * Have we reached the end of the compression block or the end of the fs/ntfs/dir.c +1
-1@@ -1194,7 +1194,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)* or signals an error (both covered by the rc test). */ for (;; ie = (INDEX_ENTRY *)((u8 *)ie +le16_to_cpu (ie->length))) { -ntfs_debug ("In index root, offset 0x%zx." , (u8 *)ie - (u8 *)ir); +ntfs_debug ("In index root, offset 0x%tx." , (u8 *)ie - (u8 *)ir);/* Bounds checks. */ if (unlikely((u8*)ie < (u8*)ir || (u8*)ie + sizeof(INDEX_ENTRY_HEADER) > index_end ||
Quoted 9 lines · Joe Perches
Please make sure to cc the specific maintainer
$ ./scripts/get_maintainer.pl -f fs/ntfs/ Anton Altaparmakov <[email protected]> (supporter:NTFS FILESYSTEM) [email protected] (open list:NTFS FILESYSTEM) [email protected] (open list)(cc'ing Anton)
Yes, I have sent to specific maintainer.
Quoted 14 lines
btw Anton, it seems
ntfs_debugdoes not terminate
messages with a "\n". That means that messages
could be interleaved with other output.Maybe this patch as well as Chen Gang's below should be applied
--- fs/ntfs/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/ntfs/debug.c +0
-0
fs/ntfs/debug.c void __ntfs_debug (const char *file, int line, const char *function, · line 133
Quoted 9 lines
fs/ntfs/debug.c +2
-1@@ -126,7 +126,8 @@ void __ntfs_debug (const char *file, int line, const char *function,va_start (args, fmt); vaf.fmt = fmt; vaf.va = &args; -pr_debug ("(%s, %d): %s(): %pV" , file, line, flen ? function :"" , &vaf); +pr_debug ("(%s, %d): %s(): %pV\n" , + file, line, flen ? function :"" , &vaf);va_end (args); }
Hmm... at least, the patch above is fine to me.
Thanks.
Signature · 3 lines
Chen Gang Open, share, and attitude like air, water, and life which God blessed