Allow obdctl to use "$OBDDEV" to resolve a device number in setup.

This required changing the NAME2DEV ioctl so that it didn't change the
currently selected device when it was resolving a name.  Now the NAME2DEV
ioctl only resolves the name, and obdctl selects the returned device
explicitly (to user-space the "name2dev" command works exactly the same).

Cleaned up setup scripts to remove last vestiges of hard-coded device numbers.
Instead we use "setup $OBDDEV" (note that the '$' must be escaped from the
shell if using it in a shell script).

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index a39dfcc..4f357fc 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -184,10 +184,11 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
         }
 
         case OBD_IOC_NAME2DEV: {
+                /* Resolve a device name.  This does not change the
+                 * currently selected device.
+                 */
                 int dev;
 
-                filp->private_data = NULL;
-
                 if (!data->ioc_inlbuf1) {
                         CERROR("No name passed!\n");
                         RETURN(-EINVAL);
@@ -202,7 +203,6 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
 
                 CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
                        dev);
-                filp->private_data = &obd_dev[data->ioc_dev];
                 err = copy_to_user((int *)arg, data, sizeof(*data));
                 RETURN(err);
         }

diff --git a/lustre/tests/llext3.sh b/lustre/tests/llext3.sh
index f957187..7a01967 100755 (executable)
--- a/lustre/tests/llext3.sh
+++ b/lustre/tests/llext3.sh
@@ -26,11 +26,11 @@ device 0
 attach mds MDSDEV
 setup ${MDS} ${MDSFS}
 device 1
-attach obdfilter OBDDEV
-setup ${OST} ext2
+attach obdext2 OBDDEV
+setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach ptlrpc RPCDEV
 setup

diff --git a/lustre/tests/lllocalmount.sh b/lustre/tests/lllocalmount.sh
index 8605bc5..70e2250 100755 (executable)
--- a/lustre/tests/lllocalmount.sh
+++ b/lustre/tests/lllocalmount.sh
@@ -29,7 +29,7 @@ attach obdext2 OBDDEV
 setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach osc OSCDEV
 setup 2

diff --git a/lustre/tests/llmount-server.sh b/lustre/tests/llmount-server.sh
index 54500ce..e22d80a 100644 (file)
--- a/lustre/tests/llmount-server.sh
+++ b/lustre/tests/llmount-server.sh
@@ -28,7 +28,7 @@ attach obdext2 OBDDEV
 setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach ptlrpc RPCDEV
 setup

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index bca0e53..50c1c16 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -26,11 +26,11 @@ device 0
 attach mds MDSDEV
 setup ${MDS} ${MDSFS}
 device 1
-attach obdfilter OBDDEV
-setup ${OST} ext2
+attach obdext2 OBDDEV
+setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach ptlrpc RPCDEV
 setup

diff --git a/lustre/tests/llrext3.sh b/lustre/tests/llrext3.sh
index 6c43181..df699c8 100755 (executable)
--- a/lustre/tests/llrext3.sh
+++ b/lustre/tests/llrext3.sh
@@ -24,11 +24,11 @@ device 0
 attach mds MDSDEV
 setup ${MDS} ${MDSFS}
 device 1
-attach obdfilter OBDDEV
-setup ${OST} ext2
+attach obdext2 OBDDEV
+setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach ptlrpc RPCDEV
 setup

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 0199d07..f5f558e 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -24,11 +24,11 @@ device 0
 attach mds MDSDEV
 setup ${MDS} ${MDSFS}
 device 1
-attach obdfilter OBDDEV
-setup ${OST} ext2
+attach obdext2 OBDDEV
+setup ${OST}
 device 2
 attach ost OSTDEV
-setup 1
+setup \$OBDDEV
 device 3
 attach ptlrpc RPCDEV
 setup

diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c
index b9fef32..b80042a 100644 (file)
--- a/lustre/utils/obdctl.c
+++ b/lustre/utils/obdctl.c
@@ -122,18 +122,6 @@ char * obdo_print(struct obdo *obd)
         return strdup(buf);
 }
 
-int getfd()
-{
-        if (fd == -1)                                           
-                fd = open("/dev/obd", O_RDWR);                     
-        if (fd == -1) {                                            
-                fprintf(stderr, "error: opening /dev/obd: %s\n",
-                        strerror(errno));         
-                return -1;
-        }
-        return 0;
-}
-
 static char *cmdname(char *func)
 {
         static char buf[512];
@@ -146,6 +134,18 @@ static char *cmdname(char *func)
         return func;
 }
 
+int getfd(char *func)
+{
+        if (fd == -1)
+                fd = open("/dev/obd", O_RDWR);
+        if (fd == -1) {
+                fprintf(stderr, "error: %s: opening /dev/obd: %s\n",
+                        cmdname(func), strerror(errno));
+                return -1;
+        }
+        return 0;
+}
+
 #define difftime(a, b)                                          \
         ((double)(a)->tv_sec - (b)->tv_sec +                    \
          ((double)((a)->tv_usec - (b)->tv_usec) / 1000000))
@@ -224,38 +224,41 @@ static int do_disconnect(char *func, int verbose)
 
 extern command_t cmdlist[];
 
-static int jt_device(int argc, char **argv)
+static int do_device(char *func, int dev)
 {
         struct obd_ioctl_data data;
-        int rc;
-
-        do_disconnect(argv[0], 1);
 
         memset(&data, 0, sizeof(data));
-        if ( argc != 2 ) {
-                fprintf(stderr, "usage: %s devno\n", cmdname(argv[0]));
-                return -1;
-        }
 
-        data.ioc_dev = strtoul(argv[1], NULL, 0);
+        data.ioc_dev = dev;
+
+        if (getfd(func))
+                return -1;
 
         if (obd_ioctl_pack(&data, &buf, max)) {
-                fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
+                fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func));
                 return -2;
         }
 
-        if (fd == -1)
-                fd = open("/dev/obd", O_RDWR);
-        if (fd == -1) {
-                fprintf(stderr, "error: %s: opening /dev/obd: %s\n",
-                        cmdname(argv[0]), strerror(errno));
-                return errno;
+        return ioctl(fd, OBD_IOC_DEVICE , buf);
+}
+
+static int jt_device(int argc, char **argv)
+{
+        int rc;
+
+        do_disconnect(argv[0], 1);
+
+        if (argc != 2) {
+                fprintf(stderr, "usage: %s devno\n", cmdname(argv[0]));
+                return -1;
         }
 
-        rc = ioctl(fd, OBD_IOC_DEVICE , buf);
+        rc = do_device(argv[0], strtoul(argv[1], NULL, 0));
+
         if (rc < 0)
-                fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
-                        OBD_IOC_DEVICE, strerror(rc = errno));
+                fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+                        strerror(rc = errno));
 
         return rc;
 }
@@ -305,10 +308,7 @@ static int jt__device(int argc, char **argv)
                 return -1;
         }
 
-        arg2[0] = "device";
-        arg2[1] = argv[1];
-        arg2[2] = NULL;
-        rc = jt_device(2, arg2);
+        rc = do_device("device", strtoul(argv[1], NULL, 0));
 
         if (!rc) {
                 arg2[0] = "connect";
@@ -449,7 +449,7 @@ static int jt_newdev(int argc, char **argv)
         struct obd_ioctl_data data;
         int rc;
 
-        if (getfd())
+        if (getfd(argv[0]))
                 return -1;
 
         IOCINIT(data);
@@ -463,8 +463,8 @@ static int jt_newdev(int argc, char **argv)
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
                         strerror(rc=errno));
-        else { 
-                printf("Current device set to %d\n", data.ioc_dev); 
+        else {
+                printf("Current device set to %d\n", data.ioc_dev);
         }
 
         return rc;
@@ -478,7 +478,8 @@ static int jt_attach(int argc, char **argv)
         IOCINIT(data);
 
         if (argc != 2 && argc != 3) {
-                fprintf(stderr, "usage: %s type [name [uuid]]\n", cmdname(argv[0]));
+                fprintf(stderr, "usage: %s type [name [uuid]]\n",
+                        cmdname(argv[0]));
                 return -1;
         }
 
@@ -514,35 +515,53 @@ static int jt_attach(int argc, char **argv)
         return rc;
 }
 
-static int jt_name2dev(int argc, char **argv)
+#define N2D_OFF 0x100    /* So we can tell between error codes and devices */
+
+static int do_name2dev(char *func, char *name)
 {
         struct obd_ioctl_data data;
         int rc;
 
-        if (getfd())
+        if (getfd(func))
                 return -1;
 
         IOCINIT(data);
 
-        if (argc != 2) { 
-                fprintf(stderr, "usage: %s name\n", cmdname(argv[0]));
-                return -1;
-        }
-
-        data.ioc_inllen1 =  strlen(argv[1]) + 1;
-        data.ioc_inlbuf1 = argv[1];
-
+        data.ioc_inllen1 = strlen(name) + 1;
+        data.ioc_inlbuf1 = name;
 
         if (obd_ioctl_pack(&data, &buf, max)) {
-                fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
+                fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func));
                 return -2;
         }
         rc = ioctl(fd, OBD_IOC_NAME2DEV , buf);
-        if (rc < 0)
-                fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
-                        OBD_IOC_NAME2DEV, strerror(rc = errno));
+        if (rc < 0) {
+                fprintf(stderr, "error: %s: %s - %s\n", cmdname(func),
+                        name, strerror(rc = errno));
+                return rc;
+        }
+
         memcpy((char *)(&data), buf, sizeof(data));
-        printf("%d\n", data.ioc_dev);
+
+        return data.ioc_dev + N2D_OFF;
+}
+
+static int jt_name2dev(int argc, char **argv)
+{
+        int rc;
+
+        if (argc != 2) {
+                fprintf(stderr, "usage: %s name\n", cmdname(argv[0]));
+                return -1;
+        }
+
+        rc = do_name2dev(argv[0], argv[1]);
+        if (rc >= N2D_OFF) {
+                int dev = rc - N2D_OFF;
+                rc = do_device(argv[0], dev);
+                if (rc == 0)
+                        printf("%d\n", dev);
+        }
         return rc;
 }
 
@@ -559,12 +578,19 @@ static int jt_setup(int argc, char **argv)
                 return -1;
         }
 
+        data.ioc_dev = -1;
         if (argc > 1) {
-                data.ioc_inllen1 =  strlen(argv[1]) + 1;
+                if (argv[1][0] == '$') {
+                        rc = do_name2dev(argv[0], argv[1] + 1);
+                        if (rc >= N2D_OFF) {
+                                printf("%s is device %d\n", argv[1],
+                                       rc - N2D_OFF);
+                                data.ioc_dev = rc - N2D_OFF;
+                        }
+                } else
+                        data.ioc_dev = strtoul(argv[1], NULL, 0);
+                data.ioc_inllen1 = strlen(argv[1]) + 1;
                 data.ioc_inlbuf1 = argv[1];
-                data.ioc_dev = strtoul(argv[1], NULL, 0);
-        } else {
-                data.ioc_dev = -1;
         }
         if ( argc == 3 ) {
                 data.ioc_inllen2 = strlen(argv[2]) + 1;