b=20226 rename osd to osd-ldiskfs

[fs/lustre-release.git] / lustre / ptlrpc / llog_client.c

diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index 2dfd086..17f7142 100644 (file)
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -58,7 +58,7 @@
 #include <libcfs/list.h>
 
 #define LLOG_CLIENT_ENTRY(ctxt, imp) do {                             \
-        mutex_down(&ctxt->loc_sem);                                   \
+        cfs_mutex_down(&ctxt->loc_sem);                               \
         if (ctxt->loc_imp) {                                          \
                 imp = class_import_get(ctxt->loc_imp);                \
         } else {                                                      \
@@ -67,19 +67,19 @@
                        "but I'll try again next time.  Not fatal.\n", \
                        ctxt->loc_idx);                                \
                 imp = NULL;                                           \
-                mutex_up(&ctxt->loc_sem);                             \
+                cfs_mutex_up(&ctxt->loc_sem);                         \
                 return (-EINVAL);                                     \
         }                                                             \
-        mutex_up(&ctxt->loc_sem);                                     \
+        cfs_mutex_up(&ctxt->loc_sem);                                 \
 } while(0)
 
 #define LLOG_CLIENT_EXIT(ctxt, imp) do {                              \
-        mutex_down(&ctxt->loc_sem);                                   \
+        cfs_mutex_down(&ctxt->loc_sem);                               \
         if (ctxt->loc_imp != imp)                                     \
                 CWARN("loc_imp has changed from %p to %p\n",          \
                        ctxt->loc_imp, imp);                           \
         class_import_put(imp);                                        \
-        mutex_up(&ctxt->loc_sem);                                     \
+        cfs_mutex_up(&ctxt->loc_sem);                                 \
 } while(0)
 
 /* This is a callback from the llog_* functions.
@@ -113,6 +113,7 @@ static int llog_client_create(struct llog_ctxt *ctxt, struct llog_handle **res,
                                  LLOG_ORIGIN_HANDLE_CREATE);
         if (rc) {
                 ptlrpc_request_free(req);
+                req = NULL;
                 GOTO(err_free, rc);
         }
         ptlrpc_request_set_replen(req);