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

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 1d411c2..6926153 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -1496,7 +1496,6 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_del);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, getref);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, putref);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, sync_fs);
 }
 
 int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats)
@@ -1719,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;
 }