From: LiuYing <emoly.liu@oracle.com>
Date: Fri, 22 Oct 2010 09:29:37 +0000 (+0800)
Subject: b=23924 LBUG: ASSERTION(hs == exp->exp_lock_hash) failed
X-Git-Tag: 2.0.55.0~12
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=16fddde4852e13c41c3332b0170bd504c7d894f6

b=23924 LBUG: ASSERTION(hs == exp->exp_lock_hash) failed

fix the wrong assertion in lprocfs_exp_print_hash()

i=andreas
i=eric.mei
---

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 87e4277..6926153 100644
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -1718,13 +1718,15 @@ int lprocfs_exp_print_hash(cfs_hash_t *hs, cfs_hash_bd_t *bd,
         struct exp_uuid_cb_data *data = cb_data;
         struct obd_export       *exp = cfs_hash_object(hs, hnode);
 
-        LASSERT(hs == exp->exp_lock_hash);
-        if (!*data->len) {
-                *data->len += cfs_hash_debug_header(data->page,
-                                                    data->count);
+        if (exp->exp_lock_hash != NULL) {
+                if (!*data->len) {
+                        *data->len += cfs_hash_debug_header(data->page,
+                                                            data->count);
+                }
+                *data->len += cfs_hash_debug_str(hs, data->page + *data->len,
+                                                 data->count);
         }
-        *data->len += cfs_hash_debug_str(hs, data->page + *data->len,
-                                         data->count);
+
         return 0;
 }