浏览代码

dm mirror: do not degrade the mirror on discard error

It may be possible that a device claims discard support but it rejects
discards with -EOPNOTSUPP.  It happens when using loopback on ext2/ext3
filesystem driven by the ext4 driver.  It may also happen if the
underlying devices are moved from one disk on another.

If discard error happens, we reject the bio with -EOPNOTSUPP, but we do
not degrade the array.

This patch fixes failed test shell/lvconvert-repair-transient.sh in the
lvm2 testsuite if the testsuite is extracted on an ext2 or ext3
filesystem and it is being driven by the ext4 driver.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Mikulas Patocka 10 年之前
父节点
当前提交
f2ed51ac64
共有 1 个文件被更改,包括 9 次插入0 次删除
  1. 9 0
      drivers/md/dm-raid1.c

+ 9 - 0
drivers/md/dm-raid1.c

@@ -604,6 +604,15 @@ static void write_callback(unsigned long error, void *context)
 		return;
 		return;
 	}
 	}
 
 
+	/*
+	 * If the bio is discard, return an error, but do not
+	 * degrade the array.
+	 */
+	if (bio->bi_rw & REQ_DISCARD) {
+		bio_endio(bio, -EOPNOTSUPP);
+		return;
+	}
+
 	for (i = 0; i < ms->nr_mirrors; i++)
 	for (i = 0; i < ms->nr_mirrors; i++)
 		if (test_bit(i, &error))
 		if (test_bit(i, &error))
 			fail_mirror(ms->mirror + i, DM_RAID1_WRITE_ERROR);
 			fail_mirror(ms->mirror + i, DM_RAID1_WRITE_ERROR);