b=1143

- forcibly_detach_exports needs to do the same import cleanup as
  target_handle_disconnect
- move some class_export_put()s to _after_ the export is finished
  being used
- fixup dump_lniobuf() and dump_rniobuf(), because my last checkin
  added a warning instead of removing a warning

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 4126cfc..1c929f1 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -43,7 +43,7 @@ int dump_ioo(struct obd_ioobj *ioo)
 
 int dump_lniobuf(struct niobuf_local *nb)
 {
-        CERROR("niobuf_local: addr=%p, offset=%d, len=%d, xid="LPU64", "
+        CERROR("niobuf_local: addr=%p, offset="LPU64", len=%d, xid=%d, "
                "page=%p\n", nb->addr, nb->offset, nb->len, nb->xid, nb->page);
         CERROR("nb->page: index = %ld\n", nb->page ? nb->page->index : -1);
 
@@ -52,7 +52,7 @@ int dump_lniobuf(struct niobuf_local *nb)
 
 int dump_rniobuf(struct niobuf_remote *nb)
 {
-        CERROR("niobuf_remote: offset=%d, len=%d, flags=%x, xid="LPU64"\n",
+        CERROR("niobuf_remote: offset="LPU64", len=%d, flags=%x, xid=%d\n",
                nb->offset, nb->len, nb->flags, nb->xid);
 
         return -EINVAL;