4 files changed, 76 insertions, 7 deletions

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 50cf96389d2c..bf61274af3bb 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2802,6 +2802,73 @@ dasd_eckd_steal_lock(struct dasd_device *device)
 }
 
 /*
+ * SNID - Sense Path Group ID
+ * This ioctl may be used in situations where I/O is stalled due to
+ * a reserve, so if the normal dasd_smalloc_request fails, we use the
+ * preallocated dasd_reserve_req.
+ */
+static int dasd_eckd_snid(struct dasd_device *device,
+                          void __user *argp)
+{
+        struct dasd_ccw_req *cqr;
+        int rc;
+        struct ccw1 *ccw;
+        int useglobal;
+        struct dasd_snid_ioctl_data usrparm;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+
+        if (copy_from_user(&usrparm, argp, sizeof(usrparm)))
+                return -EFAULT;
+
+        useglobal = 0;
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1,
+                                   sizeof(struct dasd_snid_data), device);
+        if (IS_ERR(cqr)) {
+                mutex_lock(&dasd_reserve_mutex);
+                useglobal = 1;
+                cqr = &dasd_reserve_req->cqr;
+                memset(cqr, 0, sizeof(*cqr));
+                memset(&dasd_reserve_req->ccw, 0,
+                       sizeof(dasd_reserve_req->ccw));
+                cqr->cpaddr = &dasd_reserve_req->ccw;
+                cqr->data = &dasd_reserve_req->data;
+                cqr->magic = DASD_ECKD_MAGIC;
+        }
+        ccw = cqr->cpaddr;
+        ccw->cmd_code = DASD_ECKD_CCW_SNID;
+        ccw->flags |= CCW_FLAG_SLI;
+        ccw->count = 12;
+        ccw->cda = (__u32)(addr_t) cqr->data;
+        cqr->startdev = device;
+        cqr->memdev = device;
+        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+        set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
+        cqr->retries = 5;
+        cqr->expires = 10 * HZ;
+        cqr->buildclk = get_clock();
+        cqr->status = DASD_CQR_FILLED;
+        cqr->lpm = usrparm.path_mask;
+
+        rc = dasd_sleep_on_immediatly(cqr);
+        /* verify that I/O processing didn't modify the path mask */
+        if (!rc && usrparm.path_mask && (cqr->lpm != usrparm.path_mask))
+                rc = -EIO;
+        if (!rc) {
+                usrparm.data = *((struct dasd_snid_data *)cqr->data);
+                if (copy_to_user(argp, &usrparm, sizeof(usrparm)))
+                        rc = -EFAULT;
+        }
+
+        if (useglobal)
+                mutex_unlock(&dasd_reserve_mutex);
+        else
+                dasd_sfree_request(cqr, cqr->memdev);
+        return rc;
+}
+
+/*
  * Read performance statistics
  */
 static int
@@ -3036,6 +3103,8 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
                 return dasd_eckd_reserve(device);
         case BIODASDSLCK:
                 return dasd_eckd_steal_lock(device);
+        case BIODASDSNID:
+                return dasd_eckd_snid(device, argp);
         case BIODASDSYMMIO:
                 return dasd_symm_io(device, argp);
         default:
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 0eb49655a6cd..12097c24f2f5 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -27,6 +27,7 @@
 #define DASD_ECKD_CCW_WRITE_CKD          0x1d
 #define DASD_ECKD_CCW_READ_CKD           0x1e
 #define DASD_ECKD_CCW_PSF                0x27
+#define DASD_ECKD_CCW_SNID               0x34
 #define DASD_ECKD_CCW_RSSD               0x3e
 #define DASD_ECKD_CCW_LOCATE_RECORD      0x47
 #define DASD_ECKD_CCW_SNSS               0x54
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 29c2d73d719d..6c408670e08d 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1077,15 +1077,14 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 /* FIXME: What to do with the request? */
                 switch (PTR_ERR(irb)) {
                         case -ETIMEDOUT:
-                                DBF_LH(1, "(%s): Request timed out\n",
-                                        dev_name(&cdev->dev));
+                                DBF_LH(1, "(%08x): Request timed out\n",
+                                       device->cdev_id);
                         case -EIO:
                                 __tape_end_request(device, request, -EIO);
                                 break;
                         default:
-                                DBF_LH(1, "(%s): Unexpected i/o error %li\n",
-                                        dev_name(&cdev->dev),
-                                        PTR_ERR(irb));
+                                DBF_LH(1, "(%08x): Unexpected i/o error %li\n",
+                                       device->cdev_id, PTR_ERR(irb));
                 }
                 return;
         }
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 03f07e5dd6e9..3c3f342149ec 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -47,8 +47,8 @@ tape_std_assign_timeout(unsigned long data)
                         device->cdev_id);
         rc = tape_cancel_io(device, request);
         if(rc)
-                DBF_EVENT(3, "(%s): Assign timeout: Cancel failed with rc = %i\n",
-                        dev_name(&device->cdev->dev), rc);
+                DBF_EVENT(3, "(%08x): Assign timeout: Cancel failed with rc = "
+                          "%i\n", device->cdev_id, rc);
 }
 
 int