All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n
@ 2020-04-01  7:30 YueHaibing
  2020-04-01 21:28 ` Theodore Y. Ts'o
  0 siblings, 1 reply; 3+ messages in thread
From: YueHaibing @ 2020-04-01  7:30 UTC (permalink / raw)
  To: tytso, adilger.kernel; +Cc: linux-ext4, linux-kernel, YueHaibing

fs/ext4/balloc.c: In function ‘ext4_wait_block_bitmap’:
fs/ext4/balloc.c:519:3: error: implicit declaration of function ‘ext4_error_err’; did you mean ‘ext4_error’? [-Werror=implicit-function-declaration]
   ext4_error_err(sb, EIO, "Cannot read block bitmap - "
   ^~~~~~~~~~~~~~

Add missing stub helper and fix ext4_abort.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 2ea2fc775321 ("ext4: save all error info in save_error_info() and drop ext4_set_errno()")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 fs/ext4/ext4.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index eacd2f9cc833..aa8466d28787 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2848,6 +2848,11 @@ do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
 	__ext4_error_inode(inode, "", 0, block, 0, " ");		\
 } while (0)
+#define ext4_error_inode_err(inode, func, line, block, err, fmt, ...)	\
+do {									\
+	no_printk(fmt, ##__VA_ARGS__);					\
+	__ext4_error_inode(inode, "", 0, block, 0, " ");		\
+} while (0)
 #define ext4_error_file(file, func, line, block, fmt, ...)		\
 do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
@@ -2858,10 +2863,15 @@ do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
 	__ext4_error(sb, "", 0, 0, 0, " ");				\
 } while (0)
-#define ext4_abort(sb, fmt, ...)					\
+#define ext4_error_err(sb, err, fmt, ...)				\
+do {									\
+	no_printk(fmt, ##__VA_ARGS__);					\
+	__ext4_error((sb), "", 0, 0, 0, " ");				\
+} while (0)
+#define ext4_abort(sb, err, fmt, ...)					\
 do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
-	__ext4_abort(sb, "", 0, " ");					\
+	__ext4_abort(sb, "", 0, 0, " ");				\
 } while (0)
 #define ext4_warning(sb, fmt, ...)					\
 do {									\
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n
  2020-04-01  7:30 [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n YueHaibing
@ 2020-04-01 21:28 ` Theodore Y. Ts'o
  2020-04-02  2:29   ` Yuehaibing
  0 siblings, 1 reply; 3+ messages in thread
From: Theodore Y. Ts'o @ 2020-04-01 21:28 UTC (permalink / raw)
  To: YueHaibing; +Cc: adilger.kernel, linux-ext4, linux-kernel

On Wed, Apr 01, 2020 at 03:30:38PM +0800, YueHaibing wrote:
> fs/ext4/balloc.c: In function ‘ext4_wait_block_bitmap’:
> fs/ext4/balloc.c:519:3: error: implicit declaration of function ‘ext4_error_err’; did you mean ‘ext4_error’? [-Werror=implicit-function-declaration]
>    ext4_error_err(sb, EIO, "Cannot read block bitmap - "
>    ^~~~~~~~~~~~~~
> 
> Add missing stub helper and fix ext4_abort.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: 2ea2fc775321 ("ext4: save all error info in save_error_info() and drop ext4_set_errno()")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Thanks; the patch isn't quite correct, though.  This is what I merged
into my tree's version of the "save all error info..." commit.

     	       	       	      	    	      - Ted

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index eacd2f9cc833..91eb4381cae5 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2848,6 +2848,11 @@ do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
 	__ext4_error_inode(inode, "", 0, block, 0, " ");		\
 } while (0)
+#define ext4_error_inode_err(inode, func, line, block, err, fmt, ...)	\
+do {									\
+	no_printk(fmt, ##__VA_ARGS__);					\
+	__ext4_error_inode(inode, "", 0, block, err, " ");		\
+} while (0)
 #define ext4_error_file(file, func, line, block, fmt, ...)		\
 do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
@@ -2858,10 +2863,15 @@ do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
 	__ext4_error(sb, "", 0, 0, 0, " ");				\
 } while (0)
-#define ext4_abort(sb, fmt, ...)					\
+#define ext4_error_err(sb, err, fmt, ...)				\
+do {									\
+	no_printk(fmt, ##__VA_ARGS__);					\
+	__ext4_error(sb, "", 0, err, 0, " ");				\
+} while (0)
+#define ext4_abort(sb, err, fmt, ...)					\
 do {									\
 	no_printk(fmt, ##__VA_ARGS__);					\
-	__ext4_abort(sb, "", 0, " ");					\
+	__ext4_abort(sb, "", 0, err, " ");				\
 } while (0)
 #define ext4_warning(sb, fmt, ...)					\
 do {									\

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n
  2020-04-01 21:28 ` Theodore Y. Ts'o
@ 2020-04-02  2:29   ` Yuehaibing
  0 siblings, 0 replies; 3+ messages in thread
From: Yuehaibing @ 2020-04-02  2:29 UTC (permalink / raw)
  To: Theodore Y. Ts'o; +Cc: adilger.kernel, linux-ext4, linux-kernel

On 2020/4/2 5:28, Theodore Y. Ts'o wrote:
> On Wed, Apr 01, 2020 at 03:30:38PM +0800, YueHaibing wrote:
>> fs/ext4/balloc.c: In function ‘ext4_wait_block_bitmap’:
>> fs/ext4/balloc.c:519:3: error: implicit declaration of function ‘ext4_error_err’; did you mean ‘ext4_error’? [-Werror=implicit-function-declaration]
>>    ext4_error_err(sb, EIO, "Cannot read block bitmap - "
>>    ^~~~~~~~~~~~~~
>>
>> Add missing stub helper and fix ext4_abort.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Fixes: 2ea2fc775321 ("ext4: save all error info in save_error_info() and drop ext4_set_errno()")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> 
> Thanks; the patch isn't quite correct, though.  This is what I merged
> into my tree's version of the "save all error info..." commit.
> 
>      	       	       	      	    	      - Ted
> 

Ok, good to know this and thansk!

> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index eacd2f9cc833..91eb4381cae5 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -2848,6 +2848,11 @@ do {									\
>  	no_printk(fmt, ##__VA_ARGS__);					\
>  	__ext4_error_inode(inode, "", 0, block, 0, " ");		\
>  } while (0)
> +#define ext4_error_inode_err(inode, func, line, block, err, fmt, ...)	\
> +do {									\
> +	no_printk(fmt, ##__VA_ARGS__);					\
> +	__ext4_error_inode(inode, "", 0, block, err, " ");		\
> +} while (0)
>  #define ext4_error_file(file, func, line, block, fmt, ...)		\
>  do {									\
>  	no_printk(fmt, ##__VA_ARGS__);					\
> @@ -2858,10 +2863,15 @@ do {									\
>  	no_printk(fmt, ##__VA_ARGS__);					\
>  	__ext4_error(sb, "", 0, 0, 0, " ");				\
>  } while (0)
> -#define ext4_abort(sb, fmt, ...)					\
> +#define ext4_error_err(sb, err, fmt, ...)				\
> +do {									\
> +	no_printk(fmt, ##__VA_ARGS__);					\
> +	__ext4_error(sb, "", 0, err, 0, " ");				\
> +} while (0)
> +#define ext4_abort(sb, err, fmt, ...)					\
>  do {									\
>  	no_printk(fmt, ##__VA_ARGS__);					\
> -	__ext4_abort(sb, "", 0, " ");					\
> +	__ext4_abort(sb, "", 0, err, " ");				\
>  } while (0)
>  #define ext4_warning(sb, fmt, ...)					\
>  do {									\
> 
> .
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-02  2:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01  7:30 [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n YueHaibing
2020-04-01 21:28 ` Theodore Y. Ts'o
2020-04-02  2:29   ` Yuehaibing

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.