Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935154AbeAKRRr (ORCPT + 1 other); Thu, 11 Jan 2018 12:17:47 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:36585 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935129AbeAKRRn (ORCPT ); Thu, 11 Jan 2018 12:17:43 -0500 From: Fabian Huegel To: Oleg Drokin , Andreas Dilger , James Simmons , Lai Siyao , "John L . Hammond" , Greg Kroah-Hartman , devel@driverdev.osuosl.org, Ben Evans , NeilBrown Cc: lustre-devel@lists.lustre.org, linux-kernel@vger.kernel.org, linux-kernel@i4.cs.fau.de, Fabian Huegel , Christoph Volkert Subject: [PATCH 2/8] staging: lustre: Enclose complex macros in do-while loops Date: Thu, 11 Jan 2018 18:16:56 +0100 Message-Id: <1515691022-22729-3-git-send-email-fabian_huegel@web.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515691022-22729-1-git-send-email-fabian_huegel@web.de> References: <1515691022-22729-1-git-send-email-fabian_huegel@web.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Some complex multi-line macros were not enclosed by a do-while(0), so we fixed that. Signed-off-by: Fabian Huegel Signed-off-by: Christoph Volkert --- drivers/staging/lustre/lustre/include/obd_class.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h index 5c8cf30..dbe8225 100644 --- a/drivers/staging/lustre/lustre/include/obd_class.h +++ b/drivers/staging/lustre/lustre/include/obd_class.h @@ -332,22 +332,26 @@ static inline int obd_check_dev_active(struct obd_device *obd) / sizeof(((struct obd_ops *)(0))->iocontrol)) #define OBD_COUNTER_INCREMENT(obdx, op) \ +do { \ if ((obdx)->obd_stats) { \ unsigned int coffset; \ coffset = (unsigned int)((obdx)->obd_cntr_base) + \ OBD_COUNTER_OFFSET(op); \ LASSERT(coffset < (obdx)->obd_stats->ls_num); \ lprocfs_counter_incr((obdx)->obd_stats, coffset); \ - } + } \ +} while (0) #define EXP_COUNTER_INCREMENT(export, op) \ +do { \ if ((export)->exp_obd->obd_stats) { \ unsigned int coffset; \ coffset = (unsigned int)((export)->exp_obd->obd_cntr_base) + \ OBD_COUNTER_OFFSET(op); \ LASSERT(coffset < (export)->exp_obd->obd_stats->ls_num); \ lprocfs_counter_incr((export)->exp_obd->obd_stats, coffset); \ - } + } \ +} while (0) #define MD_COUNTER_OFFSET(op) \ ((offsetof(struct md_ops, op) - \ @@ -355,15 +359,18 @@ static inline int obd_check_dev_active(struct obd_device *obd) / sizeof(((struct md_ops *)(0))->getstatus)) #define MD_COUNTER_INCREMENT(obdx, op) \ +do { \ if ((obd)->md_stats) { \ unsigned int coffset; \ coffset = (unsigned int)((obdx)->md_cntr_base) + \ MD_COUNTER_OFFSET(op); \ LASSERT(coffset < (obdx)->md_stats->ls_num); \ lprocfs_counter_incr((obdx)->md_stats, coffset); \ - } + } \ +} while (0) #define EXP_MD_COUNTER_INCREMENT(export, op) \ +do { \ if ((export)->exp_obd->obd_stats) { \ unsigned int coffset; \ coffset = (unsigned int)((export)->exp_obd->md_cntr_base) + \ @@ -373,7 +380,8 @@ static inline int obd_check_dev_active(struct obd_device *obd) if ((export)->exp_md_stats) \ lprocfs_counter_incr( \ (export)->exp_md_stats, coffset); \ - } + } \ +} while (0) #define EXP_CHECK_MD_OP(exp, op) \ do { \ -- 2.7.4