From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 10576027713536 X-Received: by 10.112.138.233 with SMTP id qt9mr4682579lbb.2.1427980643918; Thu, 02 Apr 2015 06:17:23 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 10.152.37.37 with SMTP id v5ls216788laj.31.gmail; Thu, 02 Apr 2015 06:17:23 -0700 (PDT) X-Received: by 10.112.130.71 with SMTP id oc7mr6694675lbb.13.1427980643308; Thu, 02 Apr 2015 06:17:23 -0700 (PDT) Return-Path: Received: from mail-wi0-x233.google.com (mail-wi0-x233.google.com. [2a00:1450:400c:c05::233]) by gmr-mx.google.com with ESMTPS id c8si94571wiw.1.2015.04.02.06.17.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 06:17:23 -0700 (PDT) Received-SPF: pass (google.com: domain of mahfouz.saif.elyazal@gmail.com designates 2a00:1450:400c:c05::233 as permitted sender) client-ip=2a00:1450:400c:c05::233; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mahfouz.saif.elyazal@gmail.com designates 2a00:1450:400c:c05::233 as permitted sender) smtp.mail=mahfouz.saif.elyazal@gmail.com; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: by mail-wi0-x233.google.com with SMTP id a2so104902122wia.0 for ; Thu, 02 Apr 2015 06:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=MRx9USKNnAsUs0Z/MuDfFeS97p6Y60Z9OLuVQ/TQRRc=; b=ox8KQJnsv6cYDiGf+1xFgFqAqbTs5WS+GcvmTxhIgkmecQutVcOPJF9i9Bm3gEf0zm fO0AhxHyIxxQVBHMPNQRkmqpBQza/LR6gAeFN8CYY7rpjgkFxEzOVRZh9bAJoU5o6QtX yaxF59xmkvv6EEZdFmsyoUImChdgR1ZJHp+eDnFjuMnVdi3mz2NXDL9Av+z3853TciHR 0ZVC/F7Cpcpf9n1/flAzajqQhxI9q0xbHxwebFRB8uH1tVBnGeOqUxbw1XeSNwTQoa8D sAC0H1gtLnhdlrGE3xmi3YOiivlAR5yZ5yPGqOqbygxHI4gq78c6Pj3w8vCEMcVd1FPJ PzPw== X-Received: by 10.180.212.37 with SMTP id nh5mr24022322wic.76.1427980643207; Thu, 02 Apr 2015 06:17:23 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([41.130.237.130]) by mx.google.com with ESMTPSA id ch6sm7245367wjc.3.2015.04.02.06.17.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Apr 2015 06:17:22 -0700 (PDT) Date: Thu, 2 Apr 2015 15:17:18 +0200 From: Aya Mahfouz To: Greg KH Cc: outreachy-kernel@googlegroups.com Subject: Re: [Outreachy kernel] [PATCH v2 1/3] staging: lustre: include: replace OBD_CHECK_DEV by obd_check_dev Message-ID: <20150402131718.GA2635@waves> References: <5ad6d9280a9080c3be07ca184ecdf84501c24c94.1427904237.git.mahfouz.saif.elyazal@gmail.com> <20150402083104.GA23918@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150402083104.GA23918@kroah.com> User-Agent: Mutt/1.5.23 (2014-03-12) On Thu, Apr 02, 2015 at 10:31:04AM +0200, Greg KH wrote: > On Wed, Apr 01, 2015 at 06:09:35PM +0200, Aya Mahfouz wrote: > > Static inline functions are preferred over macros. Hence, the function > > obd_check_dev was introduced. obd_check_dev replaces the macro > > OBD_CHECK_DEV. All functions that call obd_check_dev store the return > > values and return them if they represent an error code. > > > > Some of the changes were carried out manually while others were done > > using coccinelle. > > > > Signed-off-by: Aya Mahfouz > > --- > > v2: removed unneeded parenthesis around the variable obd. > > > > drivers/staging/lustre/lustre/include/obd_class.h | 33 ++++++++++++++++++----- > > 1 file changed, 27 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h > > index 5314f6f..ddc212a 100644 > > --- a/drivers/staging/lustre/lustre/include/obd_class.h > > +++ b/drivers/staging/lustre/lustre/include/obd_class.h > > @@ -341,6 +341,15 @@ do { \ > > } \ > > } while (0) > > > > +static inline int obd_check_dev(struct obd_device *obd) > > +{ > > + if (!(obd)) { > > Why the extra () here? > This was supposed to be fixed. It seems I used the first patch numbers again. I will resend the patchset. > > > + CERROR("NULL device\n"); > > + return -ENODEV; > > + } > > + return 0; > > +} > > + > > /* ensure obd_setup and !obd_stopping */ > > #define OBD_CHECK_DEV_ACTIVE(obd) \ > > do { \ > > @@ -594,7 +603,9 @@ static inline int obd_precleanup(struct obd_device *obd, > > int rc; > > DECLARE_LU_VARS(ldt, d); > > > > - OBD_CHECK_DEV(obd); > > + rc = obd_check_dev(obd); > > + if (rc) > > + return rc; > > ldt = obd->obd_type->typ_lu; > > d = obd->obd_lu_dev; > > if (ldt != NULL && d != NULL) { > > @@ -620,7 +631,9 @@ static inline int obd_cleanup(struct obd_device *obd) > > int rc; > > DECLARE_LU_VARS(ldt, d); > > > > - OBD_CHECK_DEV(obd); > > + rc = obd_check_dev(obd); > > + if (rc) > > + return rc; > > > > ldt = obd->obd_type->typ_lu; > > d = obd->obd_lu_dev; > > @@ -668,7 +681,9 @@ obd_process_config(struct obd_device *obd, int datalen, void *data) > > int rc; > > DECLARE_LU_VARS(ldt, d); > > > > - OBD_CHECK_DEV(obd); > > + rc = obd_check_dev(obd); > > + if (rc) > > + return rc; > > > > obd->obd_process_conf = 1; > > ldt = obd->obd_type->typ_lu; > > @@ -1280,7 +1295,9 @@ static inline int obd_notify(struct obd_device *obd, > > { > > int rc; > > > > - OBD_CHECK_DEV(obd); > > + rc = obd_check_dev(obd); > > + if (rc) > > + return rc; > > > > /* the check for async_recov is a complete hack - I'm hereby > > overloading the meaning to also mean "this was called from > > @@ -1381,7 +1398,11 @@ static inline int obd_health_check(const struct lu_env *env, > > static inline int obd_register_observer(struct obd_device *obd, > > struct obd_device *observer) > > { > > - OBD_CHECK_DEV(obd); > > + int rc; > > + > > + rc = obd_check_dev(obd); > > + if (rc) > > + return rc; > > down_write(&obd->obd_observer_link_sem); > > if (obd->obd_observer && observer) { > > up_write(&obd->obd_observer_link_sem); > > @@ -1389,7 +1410,7 @@ static inline int obd_register_observer(struct obd_device *obd, > > } > > obd->obd_observer = observer; > > up_write(&obd->obd_observer_link_sem); > > - return 0; > > + return rc; > > This change isn't needed in this patch. > You mean to keep it return 0 as is? > thanks, > > greg k-h -- Kind Regards, Aya Saif El-yazal Mahfouz