- show for seq-srv only super range, space is not used in it.

diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c
index f396633..0e89a8a 100644 (file)
--- a/lustre/fid/fid_store.c
+++ b/lustre/fid/fid_store.c
@@ -91,9 +91,14 @@ int seq_store_write(struct lu_server_seq *seq,
                                                     seq_record_buf(info),
                                                     &pos, th, BYPASS_CAPA);
                 if (rc == sizeof(info->sti_record)) {
-                        CDEBUG(D_INFO|D_WARNING, "%s: Store ranges: Space - "
-                               DRANGE", Super - "DRANGE"\n", seq->lss_name,
-                               PRANGE(&seq->lss_space), PRANGE(&seq->lss_super));
+                        if (seq->lss_type == LUSTRE_SEQ_SERVER) {
+                                CDEBUG(D_INFO|D_WARNING, "%s: Pool - "DRANGE"\n",
+                                       seq->lss_name, PRANGE(&seq->lss_super));
+                        } else {
+                                CDEBUG(D_INFO|D_WARNING, "%s: Space - "DRANGE
+                                       ", Pool - "DRANGE"\n", seq->lss_name,
+                                       PRANGE(&seq->lss_space), PRANGE(&seq->lss_super));
+                        }
                         rc = 0;
                 } else if (rc >= 0) {
                         rc = -EIO;
@@ -129,9 +134,14 @@ int seq_store_read(struct lu_server_seq *seq,
                 range_le_to_cpu(&seq->lss_space, &info->sti_record.ssr_space);
                 range_le_to_cpu(&seq->lss_super, &info->sti_record.ssr_super);
 
-                CDEBUG(D_INFO|D_WARNING, "%s: Read ranges: Space - "
-                       DRANGE", Super - "DRANGE"\n", seq->lss_name,
-                       PRANGE(&seq->lss_space), PRANGE(&seq->lss_super));
+                if (seq->lss_type == LUSTRE_SEQ_SERVER) {
+                        CDEBUG(D_INFO|D_WARNING, "%s: Pool - "DRANGE"\n",
+                               seq->lss_name, PRANGE(&seq->lss_super));
+                } else {
+                        CDEBUG(D_INFO|D_WARNING, "%s: Space - "DRANGE", Pool - "
+                               DRANGE"\n", seq->lss_name, PRANGE(&seq->lss_space),
+                               PRANGE(&seq->lss_super));
+                }
                 rc = 0;
         } else if (rc == 0) {
                 rc = -ENODATA;

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 2ec7f9b..8994dda 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -336,6 +336,7 @@ __put_mem_track(void *ptr, int size,
                 CWARN("Ptr 0x%p is not allocated. Attempt to free "
                       "not allocated memory at %s:%d\n", ptr,
                       file, line);
+                LBUG();
                 return 0;
         } else {
                 if (mt->mt_size != size) {

diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index 2916282..8f8ac3c 100644 (file)
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -551,8 +551,11 @@ EXPORT_SYMBOL(lvfs_memdbg_find);
 
 int lvfs_memdbg_check_insert(struct obd_mem_track *mt)
 {
+        struct obd_mem_track *tmp;
+        
         spin_lock(&obd_memlist_lock);
-        if (!__lvfs_memdbg_find(mt->mt_ptr)) {
+        tmp = __lvfs_memdbg_find(mt->mt_ptr);
+        if (tmp == NULL) {
                 __lvfs_memdbg_insert(mt);
                 spin_unlock(&obd_memlist_lock);
                 return 1;
@@ -610,9 +613,9 @@ void lvfs_memdbg_show(void)
                                 header = 1;
                         }
                         mt = hlist_entry(node, struct obd_mem_track, mt_hash);
-                        CWARN("  [%s] ptr: 0x%p, size: %d, src at \"%s\"\n",
+                        CWARN("  [%s] ptr: 0x%p, size: %d, src at %s\n",
                               ((mt->mt_flags & OBD_MT_WRONG_SIZE) ?
-                               "wrong ck size" : "leaked memory"),
+                               "wrong size" : "leaked memory"),
                               mt->mt_ptr, mt->mt_size, mt->mt_loc);
                 }
         }

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 6f98ef9..e80478f 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -636,8 +636,8 @@ static void mdc_commit_open(struct ptlrpc_request *req)
 static void mdc_replay_open(struct ptlrpc_request *req)
 {
         struct mdc_open_data *mod = req->rq_cb_data;
-        struct obd_client_handle *och;
         struct ptlrpc_request *close_req;
+        struct obd_client_handle *och;
         struct lustre_handle old;
         struct mdt_body *body;
         ENTRY;
@@ -677,7 +677,7 @@ static void mdc_replay_open(struct ptlrpc_request *req)
                                        sizeof(*epoch));
                 LASSERT(epoch);
                 if (och != NULL)
-                        LASSERT(!memcmp(&old, &epoch->handle, sizeof old));
+                        LASSERT(!memcmp(&old, &epoch->handle, sizeof(old)));
                 DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
                 memcpy(&epoch->handle, &body->handle,
                        sizeof(epoch->handle));