AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-16 10:37:01 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: include: replace OBD_CHECK_DEV by obd_check_dev

Browse Source 
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 <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aya Mahfouz 2015-04-02 19:59:15 +02:00 committed by Greg Kroah-Hartman
parent a18dd4702c
commit 4ca1b8fbe6
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/lustre/lustre/include/obd_class.h
View File

@ -341,6 +341,15 @@ do { \
} \ } \
} while (0) } while (0)
static inline int obd_check_dev(struct obd_device *obd)
{
if (!obd) {
CERROR("NULL device\n");
return -ENODEV;
}
return 0;
}
/* ensure obd_setup and !obd_stopping */ /* ensure obd_setup and !obd_stopping */
#define OBD_CHECK_DEV_ACTIVE(obd) \ #define OBD_CHECK_DEV_ACTIVE(obd) \
do { \ do { \
@ -594,7 +603,9 @@ static inline int obd_precleanup(struct obd_device *obd,
int rc; int rc;
DECLARE_LU_VARS(ldt, d); DECLARE_LU_VARS(ldt, d);
OBD_CHECK_DEV(obd); rc = obd_check_dev(obd);
if (rc)
return rc;
ldt = obd->obd_type->typ_lu; ldt = obd->obd_type->typ_lu;
d = obd->obd_lu_dev; d = obd->obd_lu_dev;
if (ldt != NULL && d != NULL) { if (ldt != NULL && d != NULL) {
@ -620,7 +631,9 @@ static inline int obd_cleanup(struct obd_device *obd)
int rc; int rc;
DECLARE_LU_VARS(ldt, d); DECLARE_LU_VARS(ldt, d);
OBD_CHECK_DEV(obd); rc = obd_check_dev(obd);
if (rc)
return rc;
ldt = obd->obd_type->typ_lu; ldt = obd->obd_type->typ_lu;
d = obd->obd_lu_dev; d = obd->obd_lu_dev;
@ -668,7 +681,9 @@ obd_process_config(struct obd_device *obd, int datalen, void *data)
int rc; int rc;
DECLARE_LU_VARS(ldt, d); DECLARE_LU_VARS(ldt, d);
OBD_CHECK_DEV(obd); rc = obd_check_dev(obd);
if (rc)
return rc;
obd->obd_process_conf = 1; obd->obd_process_conf = 1;
ldt = obd->obd_type->typ_lu; ldt = obd->obd_type->typ_lu;
@ -1280,7 +1295,9 @@ static inline int obd_notify(struct obd_device *obd,
{ {
int rc; 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 /* the check for async_recov is a complete hack - I'm hereby
overloading the meaning to also mean "this was called from 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, static inline int obd_register_observer(struct obd_device *obd,
struct obd_device *observer) 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); down_write(&obd->obd_observer_link_sem);
if (obd->obd_observer && observer) { if (obd->obd_observer && observer) {
up_write(&obd->obd_observer_link_sem); up_write(&obd->obd_observer_link_sem);