tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
md: fix v1.x metadata update when a disk is missing.
md: call md_update_sb even for 'external' metadata arrays.

Linus Torvalds 343d04d4 653d48b2

+4 -2
+4 -2
drivers/md/md.c
··· 1643 1643 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; 1644 1644 if (rdev->sb_size & bmask) 1645 1645 rdev->sb_size = (rdev->sb_size | bmask) + 1; 1646 - } 1646 + } else 1647 + max_dev = le32_to_cpu(sb->max_dev); 1648 + 1647 1649 for (i=0; i<max_dev;i++) 1648 1650 sb->dev_roles[i] = cpu_to_le16(0xfffe); 1649 1651 ··· 7071 7069 if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) 7072 7070 return; 7073 7071 if ( ! ( 7074 - (mddev->flags && !mddev->external) || 7072 + (mddev->flags & ~ (1<<MD_CHANGE_PENDING)) || 7075 7073 test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || 7076 7074 test_bit(MD_RECOVERY_DONE, &mddev->recovery) || 7077 7075 (mddev->external == 0 && mddev->safemode == 1) ||