浏览代码

dasd: fix list_del corruption during format

If I/O errors occur during format a kernel panic with a list_del
corruption may occur.

Stop error recovery procedure after an erp action was taken.

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Stefan Haberland 11 年之前
父节点
当前提交
8fa56aed12
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      drivers/s390/block/dasd.c

+ 5 - 1
drivers/s390/block/dasd.c

@@ -2307,8 +2307,12 @@ retry:
 
 	rc = 0;
 	list_for_each_entry_safe(cqr, n, ccw_queue, blocklist) {
-		if (__dasd_sleep_on_erp(cqr))
+		if (__dasd_sleep_on_erp(cqr)) {
+			if (!cqr->status == DASD_CQR_TERMINATED &&
+			    !cqr->status == DASD_CQR_NEED_ERP)
+				break;
 			rc = 1;
+		}
 	}
 	if (rc)
 		goto retry;