[S390] dasd: ignore unsolicited interrupts for DIAG (56b86b61) · Commits · 戴 / test

For the DASD DIAG discipline IO is started through special diagnose calls. Unsolicited interrupts may contain information about the device itself. But this information is not needed because the device is not used directly. Fix the case that an unimplemented dicipline function may be called by ignoring unsolicited interrupts for the DIAG disciplin. Signed-off-by:

Stefan Haberland <stefan.haberland@de.ibm.com> Signed-off-by:

Martin Schwidefsky <schwidefsky@de.ibm.com>

drivers/s390/block/dasd.c

+14 −9

Original line number	Diff line number	Diff line
		@@ -1107,7 +1107,13 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
		if (cqr)
		memcpy(&cqr->irb, irb, sizeof(*irb));
		device = dasd_device_from_cdev_locked(cdev);
		if (!IS_ERR(device)) {
		if (IS_ERR(device))
		return;
		/* ignore unsolicited interrupts for DIAG discipline */
		if (device->discipline == dasd_diag_discipline_pointer) {
		dasd_put_device(device);
		return;
		}
		device->discipline->dump_sense_dbf(device, irb,
		"unsolicited");
		if ((device->features & DASD_FEATURE_ERPLOG))
		@@ -1117,7 +1123,6 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
		device->discipline->handle_unsolicited_interrupt(device,
		irb);
		dasd_put_device(device);
		}
		return;
		}

Admin message