engines/pmemblk: get rid of CACHE_LOCK/UNLOCK defines

Much clearer to just call the pthread mutex lock/unlock directly,
since you don't have to looku what this macro does.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/engines/pmemblk.c b/engines/pmemblk.c
index 35a29e3ba47146745e2563ac2e20392a80497c2b..ab4b7697dcc3f61421392e4cbff7b3b9286eb9cc 100644 (file)
--- a/engines/pmemblk.c
+++ b/engines/pmemblk.c
@@ -137,10 +137,6 @@ struct fio_pmemblk_file {
 static fio_pmemblk_file_t Cache = NULL;
 
 static pthread_mutex_t CacheLock = PTHREAD_MUTEX_INITIALIZER;
 static fio_pmemblk_file_t Cache = NULL;
 
 static pthread_mutex_t CacheLock = PTHREAD_MUTEX_INITIALIZER;

-#define CACHE_LOCK()  \
-       (void)pthread_mutex_lock(&CacheLock)
-#define CACHE_UNLOCK()  \
-       (void)pthread_mutex_unlock(&CacheLock)

 
 #define PMB_CREATE   (0x0001)  /* should create file */
 
 
 #define PMB_CREATE   (0x0001)  /* should create file */
 


@@ -254,7 +250,7 @@ static
        if (NULL == path)
                return NULL;
 
        if (NULL == path)
                return NULL;
 

-       CACHE_LOCK();
+       pthread_mutex_lock(&CacheLock);

 
        pmb = fio_pmemblk_cache_lookup(path);
 
 
        pmb = fio_pmemblk_cache_lookup(path);
 


@@ -294,7 +290,7 @@ static
 
        pmb->pmb_refcnt += 1;
 
 
        pmb->pmb_refcnt += 1;
 

-       CACHE_UNLOCK();
+       pthread_mutex_unlock(&CacheLock);

 
        return pmb;
 
 
        return pmb;
 


@@ -308,14 +304,15 @@ error:
        }
        if (NULL != path)
                free(path);
        }
        if (NULL != path)
                free(path);

-       CACHE_UNLOCK();
+
+       pthread_mutex_unlock(&CacheLock);

        return NULL;
 
 }                              /* pmb_open() */
 
 static void pmb_close(fio_pmemblk_file_t pmb, const int keep)
 {
        return NULL;
 
 }                              /* pmb_open() */
 
 static void pmb_close(fio_pmemblk_file_t pmb, const int keep)
 {

-       CACHE_LOCK();
+       pthread_mutex_lock(&CacheLock);

 
        pmb->pmb_refcnt--;
 
 
        pmb->pmb_refcnt--;
 


@@ -328,7 +325,7 @@ static void pmb_close(fio_pmemblk_file_t pmb, const int keep)
                free(pmb);
        }
 
                free(pmb);
        }
 

-       CACHE_UNLOCK();
+       pthread_mutex_unlock(&CacheLock);

 
 }                              /* pmb_close() */
 
 
 }                              /* pmb_close() */