- Quiet some journal verbosity

- Fixed (I hope) some ia64 unaligned access warnings

diff --git a/lustre/lib/obd_pack.c b/lustre/lib/obd_pack.c
index b4f0254..af32e39 100644 (file)
--- a/lustre/lib/obd_pack.c
+++ b/lustre/lib/obd_pack.c
@@ -34,7 +34,7 @@ void ost_pack_ioo(void **tmp, struct obdo *oa, int bufcnt)
 
         ioo->ioo_id = HTON__u64(oa->o_id); 
         ioo->ioo_gr = HTON__u64(oa->o_gr); 
-        ioo->ioo_type = HTON__u64(oa->o_mode); 
+        ioo->ioo_type = HTON__u32(oa->o_mode); 
         ioo->ioo_bufcnt = HTON__u32(bufcnt); 
         *tmp = c + sizeof(*ioo); 
 }
@@ -47,7 +47,7 @@ void ost_unpack_ioo(void **tmp, struct obd_ioobj **ioop)
 
         ioo->ioo_id = NTOH__u64(ioo->ioo_id); 
         ioo->ioo_gr = NTOH__u64(ioo->ioo_gr); 
-        ioo->ioo_type = NTOH__u64(ioo->ioo_type); 
+        ioo->ioo_type = NTOH__u32(ioo->ioo_type); 
         ioo->ioo_bufcnt = NTOH__u32(ioo->ioo_bufcnt); 
         *tmp = c + sizeof(*ioo); 
 }

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index b12ad7d..17e1ef4 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -367,11 +367,12 @@ static int ost_brw_write_cb(struct ptlrpc_bulk_page *bulk)
          */
         journal_save = current->journal_info;
         current->journal_info = bulk->b_desc->b_journal_info;
-        CERROR("journal_info: saved %p->%p, restored %p\n", current,
+        CDEBUG(D_BUFFS, "journal_info: saved %p->%p, restored %p\n", current,
                journal_save, bulk->b_desc->b_journal_info);
         rc = ost_commit_page(&bulk->b_desc->b_conn, bulk->b_page);
         current->journal_info = journal_save;
-        CERROR("journal_info: restored %p->%p\n", current, journal_save);
+        CDEBUG(D_BUFFS, "journal_info: restored %p->%p\n", current,
+               journal_save);
         if (rc)
                 CERROR("ost_commit_page failed: %d\n", rc);