All of lore.kernel.org
 help / color / mirror / Atom feed
From: NeilBrown <neilb@suse.de>
To: linux-raid@vger.kernel.org
Cc: stable@kernel.org, NeilBrown <neilb@suse.de>
Subject: [md PATCH 5/8] md: Handle growth of v1.x metadata correctly.
Date: Mon, 03 Aug 2009 07:58:18 +1000	[thread overview]
Message-ID: <20090802215818.4198.37394.stgit@notabene.brown> (raw)
In-Reply-To: <20090802215444.4198.83094.stgit@notabene.brown>

The v1.x metadata does not have a fixed size and can grow
when devices are added.
If it grows enough to require an extra sector of storage,
we need to update the 'sb_size' to match.

Without this, md can write out an incomplete superblock with a
bad checksum, which will be rejected when trying to re-assemble
the array.

Cc: stable@kernel.org
Signed-off-by: NeilBrown <neilb@suse.de>
---

 drivers/md/md.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index fc04963..5b507e9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1399,8 +1399,14 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
 		if (rdev2->desc_nr+1 > max_dev)
 			max_dev = rdev2->desc_nr+1;
 
-	if (max_dev > le32_to_cpu(sb->max_dev))
+	if (max_dev > le32_to_cpu(sb->max_dev)) {
+		int bmask;
 		sb->max_dev = cpu_to_le32(max_dev);
+		rdev->sb_size = max_dev * 2 + 256;
+		bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
+		if (rdev->sb_size & bmask)
+			rdev->sb_size = (rdev->sb_size | bmask) + 1;
+	}
 	for (i=0; i<max_dev;i++)
 		sb->dev_roles[i] = cpu_to_le16(0xfffe);
 	



  parent reply	other threads:[~2009-08-02 21:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-02 21:58 [md PATCH 0/8] Assort md updates for 2.6.31 NeilBrown
2009-08-02 21:58 ` [md PATCH 2/8] md: Push down data integrity code to personalities NeilBrown
2009-08-02 21:58 ` [md PATCH 3/8] md: when a level change reduces the number of devices, remove the excess NeilBrown
2009-08-02 21:58 ` NeilBrown [this message]
2009-08-02 21:58 ` [md PATCH 6/8] md/raid5: set reshape_position correctly when reshape starts NeilBrown
2009-08-02 21:58 ` [md PATCH 4/8] md: avoid array overflow with bad v1.x metadata NeilBrown
2009-08-02 21:58 ` [md PATCH 7/8] md: allow raid5_quiesce to work properly when reshape is happening NeilBrown
2009-08-02 21:58 ` [md PATCH 1/8] md/raid6: release spare page at ->stop() NeilBrown
2009-08-02 21:58 ` [md PATCH 8/8] md: Use revalidate_disk to effect changes in size of device NeilBrown
2009-08-05 22:07   ` H. Peter Anvin
2009-08-06  1:03     ` Mike Snitzer
2009-08-06  1:15       ` H. Peter Anvin
2009-08-06  3:13         ` Neil Brown
2009-08-06  3:13           ` Neil Brown
2009-08-06  4:35           ` H. Peter Anvin
2009-08-07 13:57           ` Mike Snitzer
2009-08-07 13:57             ` Mike Snitzer
2009-08-10  1:26             ` Neil Brown
2009-08-10  1:26               ` Neil Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090802215818.4198.37394.stgit@notabene.brown \
    --to=neilb@suse.de \
    --cc=linux-raid@vger.kernel.org \
    --cc=stable@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.