Branch HEAD

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

diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index 12b8393..bded4c3 100644 (file)
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -57,7 +57,7 @@
 #include <lustre_net.h>
 #include <libcfs/list.h>
 
-#define  LLOG_CLIENT_ENTRY(ctxt, imp) do {                            \
+#define LLOG_CLIENT_ENTRY(ctxt, imp) do {                             \
         mutex_down(&ctxt->loc_sem);                                   \
         if (ctxt->loc_imp) {                                          \
                 imp = class_import_get(ctxt->loc_imp);                \
@@ -73,13 +73,13 @@
         mutex_up(&ctxt->loc_sem);                                     \
 } while(0)
 
-#define  LLOG_CLIENT_EXIT(ctxt, imp) do {                  \
-        mutex_down(&ctxt->loc_sem);                        \
-        if (ctxt->loc_imp != imp)                          \
-                CWARN("loc_imp has changed from %p to %p", \
-                       ctxt->loc_imp, imp);                \
-        class_import_put(imp);                             \
-        mutex_up(&ctxt->loc_sem);                          \
+#define LLOG_CLIENT_EXIT(ctxt, imp) do {                              \
+        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);                                     \
 } 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);