From patchwork Wed Apr 1 07:30:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yue Haibing X-Patchwork-Id: 1265061 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48sdJX24g9z9sSb for ; Wed, 1 Apr 2020 18:35:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731992AbgDAHfE (ORCPT ); Wed, 1 Apr 2020 03:35:04 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:12595 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731870AbgDAHfD (ORCPT ); Wed, 1 Apr 2020 03:35:03 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 818B5F262207DA92C326; Wed, 1 Apr 2020 15:35:00 +0800 (CST) Received: from localhost (10.173.223.234) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Wed, 1 Apr 2020 15:34:51 +0800 From: YueHaibing To: , CC: , , YueHaibing Subject: [PATCH -next] ext4: Fix build error while CONFIG_PRINTK is n Date: Wed, 1 Apr 2020 15:30:38 +0800 Message-ID: <20200401073038.33076-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.173.223.234] X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 Fixes: 2ea2fc775321 ("ext4: save all error info in save_error_info() and drop ext4_set_errno()") Signed-off-by: YueHaibing --- 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 { \