1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 116611583df8..aee4656127f7 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -222,7 +222,7 @@ static void dasd_fba_handle_unsolicited_interrupt(struct dasd_device *device,
 
         /* first of all check for state change pending interrupt */
         mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
-        if ((irb->scsw.dstat & mask) == mask) {
+        if ((irb->scsw.cmd.dstat & mask) == mask) {
                 dasd_generic_handle_state_change(device);
                 return;
         }
@@ -449,11 +449,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                       device->cdev->dev.bus_id);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
-                       irb->scsw.cstat, irb->scsw.dstat);
+                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        device->cdev->dev.bus_id,
-                       (void *) (addr_t) irb->scsw.cpa);
+                       (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
                         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
@@ -498,11 +498,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
 
         /* print failing CCW area */
         len = 0;
-        if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2) {
-                act = ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2;
+        if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2) {
+                act = ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2;
                 len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
         }
-        end = min((struct ccw1 *)(addr_t) irb->scsw.cpa + 2, last);
+        end = min((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa + 2, last);
         while (act <= end) {
                 len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",