- Fixed really stupid bug in events.c that was dereferencing a freed struct

- Made llrmount.sh not suck.

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index a016f35..405ed48 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -161,14 +161,14 @@ static int bulk_sink_callback(ptl_event_t *ev, void *data)
                 if (bulk->b_buf != ev->mem_desc.start + ev->offset)
                         CERROR("bulkbuf != mem_desc -- why?\n");
                 desc->b_finished_count++;
+                if (bulk->b_cb != NULL)
+                        bulk->b_cb(bulk);
                 if (desc->b_finished_count == desc->b_page_count) {
                         desc->b_flags |= PTL_BULK_FL_RCVD;
                         wake_up_interruptible(&desc->b_waitq);
                         if (desc->b_cb != NULL)
                                 desc->b_cb(desc);
                 }
-                if (bulk->b_cb != NULL)
-                        bulk->b_cb(bulk);
         } else {
                 CERROR("Unexpected event type!\n");
                 LBUG();

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index f5f558e..bf7948a 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -20,25 +20,22 @@ MDS=$LOOPDEV
 echo 0xffffffff > /proc/sys/portals/debug
 
 $OBDCTL <<EOF
-device 0
+newdev
 attach mds MDSDEV
 setup ${MDS} ${MDSFS}
-device 1
+newdev
 attach obdext2 OBDDEV
 setup ${OST}
-device 2
+newdev
 attach ost OSTDEV
 setup \$OBDDEV
-device 3
-attach ptlrpc RPCDEV
-setup
-device 4
+newdev
 attach ldlm LDLMDEV
 setup
-device 5
+newdev
 attach osc OSCDEV
 setup -1
 quit
 EOF
 
-mount -t lustre_lite -o device=5 none /mnt/lustre
+mount -t lustre_lite -o device=`$OBDCTL name2dev OSCDEV` none /mnt/lustre