- don't free the request when you drop the packet--it's on the stack

- brought mdcreq.sh into the year 2002 (even though the mdc ioctl interface is
  still broken)

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index d271fb6..9386395 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -57,7 +57,6 @@ do {                                                                    \
                 break;                                                  \
                                                                         \
         CDEBUG(D_OTHER, "obd_drop_packet=%d, dropping packet.\n", id);  \
-        ptlrpc_free_req(req);                                           \
         RETURN(0);                                                      \
 } while(0)
 

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 67ef83f..4d5bfdf 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -236,7 +236,7 @@ static int request_ioctl(struct inode *inode, struct file *file,
         /* XXX complete this to get debugging working again */
         err = -1;
        if (err) {
-                CERROR("cannot create client"); 
+                CERROR("cannot create client\n");
                 return -EINVAL;
         }
        

diff --git a/lustre/tests/mdcreq.sh b/lustre/tests/mdcreq.sh
index 47f2902..b9b5f05 100644 (file)
--- a/lustre/tests/mdcreq.sh
+++ b/lustre/tests/mdcreq.sh
@@ -3,40 +3,27 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-mknod /dev/portals c 10 240
+setup
 
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-
-$R/usr/src/portals/linux/utils/acceptor 1234 &
-
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
-mynid
+$PTLCTL <<EOF
+mynid localhost
 setup tcp
 connect localhost 1234
 add_uuid self
 add_uuid mds
+quit
 EOF
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
-
-dd if=/dev/zero of=/tmp/fs bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/fs
-losetup ${LOOP}0 /tmp/fs
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 10000
+MDS=$LOOPDEV
 
-mknod /dev/obd c 10 241
+echo 0xffffffff > /proc/sys/portals/debug
 
 $R/usr/src/obd/utils/obdctl <<EOF
 device 0
 attach mds
-setup ${LOOP}0 ext2
+setup ${MDS} ${MDSFS}
 quit
 EOF