- changed format of ranges output.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index c3a1666..e5e6f9f 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -182,7 +182,7 @@ static inline int range_is_exhausted(struct lu_range *r)
         return range_space(r) == 0;
 }
 
-#define DRANGE "["LPX64"-"LPX64"]"
+#define DRANGE "[%16.16"LPF64"x-%16.16"LPF64"x]"
 
 #define PRANGE(range)      \
         (range)->lr_start, \

diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index 8f8ac3c..7a88b95 100644 (file)
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -437,8 +437,8 @@ EXPORT_SYMBOL(obd_memmax);
 
 #if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__)
 static spinlock_t obd_memlist_lock = SPIN_LOCK_UNLOCKED;
-static struct hlist_head *obd_memtable;
-static unsigned long obd_memtable_size;
+static struct hlist_head *obd_memtable = NULL;
+static unsigned long obd_memtable_size = 0;
 
 static int lvfs_memdbg_init(int size)
 {
@@ -451,6 +451,7 @@ static int lvfs_memdbg_init(int size)
         CWARN("Allocating %lu memdbg entries.\n",
               (unsigned long)obd_memtable_size);
 
+        LASSERT(obd_memtable == NULL);
         obd_memtable = kmalloc(size, GFP_KERNEL);
         if (!obd_memtable)
                 return -ENOMEM;

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index 8932f84..be393cf 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -972,7 +972,7 @@ void mdt_fs_cleanup(const struct lu_env *env, struct mdt_device *mdt)
 {
         struct obd_device *obd = mdt->mdt_md_dev.md_lu_dev.ld_obd;
 
-        /* remove transaction callback */
+        /* Remove transaction callback */
         dt_txn_callback_del(mdt->mdt_bottom, &mdt->mdt_txn_cb);
 
         class_disconnect_exports(obd); /* cleans up client info too */