diff options
| author | Mike Shuey <shuey@purdue.edu> | 2015-05-19 10:14:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-31 09:35:38 +0900 |
| commit | bdd84a6f4baf3e1d02955545cf83c6a7e6a470db (patch) | |
| tree | b7752bd1702d4a58d9cc0df377500c56146501a9 /drivers/staging/lustre/lnet/lnet/module.c | |
| parent | 74d680116219380ed946bb3ad24237f2424fdb66 (diff) | |
| download | op-kernel-dev-bdd84a6f4baf3e1d02955545cf83c6a7e6a470db.zip op-kernel-dev-bdd84a6f4baf3e1d02955545cf83c6a7e6a470db.tar.gz | |
staging: lustre: lnet: remove LNET_MUTEX_LOCK macro
LNET_MUTEX_LOCK and LNET_MUTEX_UNLOCK are verbose wrappers to mutex_lock and
mutex_unlock. Get rid of these.
Signed-off-by: Mike Shuey <shuey@purdue.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet/lnet/module.c')
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/module.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c index f73d644..6881b9c 100644 --- a/drivers/staging/lustre/lnet/lnet/module.c +++ b/drivers/staging/lustre/lnet/lnet/module.c @@ -49,7 +49,7 @@ lnet_configure(void *arg) /* 'arg' only there so I can be passed to cfs_create_thread() */ int rc = 0; - LNET_MUTEX_LOCK(&lnet_config_mutex); + mutex_lock(&lnet_config_mutex); if (!the_lnet.ln_niinit_self) { rc = LNetNIInit(LUSTRE_SRV_LNET_PID); @@ -59,7 +59,7 @@ lnet_configure(void *arg) } } - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); return rc; } @@ -68,18 +68,18 @@ lnet_unconfigure(void) { int refcount; - LNET_MUTEX_LOCK(&lnet_config_mutex); + mutex_lock(&lnet_config_mutex); if (the_lnet.ln_niinit_self) { the_lnet.ln_niinit_self = 0; LNetNIFini(); } - LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex); + mutex_lock(&the_lnet.ln_api_mutex); refcount = the_lnet.ln_refcount; - LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex); + mutex_unlock(&the_lnet.ln_api_mutex); - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); return (refcount == 0) ? 0 : -EBUSY; } |
