public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 01/19] xfs: growfs: don't read garbage for new secondary superblocks
Date: Tue,  9 Oct 2012 14:50:52 +1100	[thread overview]
Message-ID: <1349754670-32009-2-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1349754670-32009-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

When updating new secondary superblocks in a growfs operation, the
sueprblock buffer is read from the newly grown region of the
underlying device. This is not guaranteed to be zero, so violates
the underlying assumption that the unused parts of superblocks are
zero filled. Get a new buffer for these secondary superblocks to
ensure that the unused regions are zero filled correctly.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_fsops.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index c25b094..4beaede 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -399,9 +399,26 @@ xfs_growfs_data_private(
 
 	/* update secondary superblocks. */
 	for (agno = 1; agno < nagcount; agno++) {
-		error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp,
+		error = 0;
+		/*
+		 * new secondary superblocks need to be zeroed, not read from
+		 * disk as the contents of the new area we are growing into is
+		 * completely unknown.
+		 */
+		if (agno < oagcount) {
+			error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp,
 				  XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)),
 				  XFS_FSS_TO_BB(mp, 1), 0, &bp);
+		} else {
+			bp = xfs_trans_get_buf(NULL, mp->m_ddev_targp,
+				  XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)),
+				  XFS_FSS_TO_BB(mp, 1), 0);
+			if (bp)
+				xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
+			else
+				error = ENOMEM;
+		}
+
 		if (error) {
 			xfs_warn(mp,
 		"error %d reading secondary superblock for ag %d",
@@ -423,7 +440,7 @@ xfs_growfs_data_private(
 			break; /* no point in continuing */
 		}
 	}
-	return 0;
+	return error;
 
  error0:
 	xfs_trans_cancel(tp, XFS_TRANS_ABORT);
-- 
1.7.10

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2012-10-09  3:49 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-09  3:50 [PATCH 00/19] xfs: buffer read verifier infrastructure Dave Chinner
2012-10-09  3:50 ` Dave Chinner [this message]
2012-10-11 21:34   ` [PATCH 01/19] xfs: growfs: don't read garbage for new secondary superblocks Christoph Hellwig
2012-10-09  3:50 ` [PATCH 02/19] xfs: make buffer read verication an IO completion function Dave Chinner
2012-10-11 21:36   ` Christoph Hellwig
2012-10-09  3:50 ` [PATCH 03/19] xfs: uncached buffer reads need to return an error Dave Chinner
2012-10-11 21:38   ` Christoph Hellwig
2012-10-11 22:11     ` Dave Chinner
2012-10-12  2:28       ` Dave Chinner
2012-10-09  3:50 ` [PATCH 04/19] xfs: verify superblocks as they are read from disk Dave Chinner
2012-10-11 21:41   ` Christoph Hellwig
2012-10-11 22:28     ` Dave Chinner
2012-10-09  3:50 ` [PATCH 05/19] xfs: verify AGF blocks " Dave Chinner
2012-10-11 21:42   ` Christoph Hellwig
2012-10-09  3:50 ` [PATCH 06/19] xfs: verify AGI " Dave Chinner
2012-10-11 21:43   ` Christoph Hellwig
2012-10-09  3:50 ` [PATCH 07/19] xfs: verify AGFL " Dave Chinner
2012-10-11 21:44   ` Christoph Hellwig
2012-10-11 21:52     ` Dave Chinner
2012-10-09  3:50 ` [PATCH 08/19] xfs: verify inode buffers " Dave Chinner
2012-10-11 21:45   ` Christoph Hellwig
2012-10-11 21:55     ` Dave Chinner
2012-10-09  3:51 ` [PATCH 09/19] xfs: verify btree blocks " Dave Chinner
2012-10-09  3:51 ` [PATCH 10/19] xfs: verify dquot " Dave Chinner
2012-10-11 21:48   ` Christoph Hellwig
2012-10-11 22:08     ` Dave Chinner
2012-10-09  3:51 ` [PATCH 11/19] xfs: add verifier callback to directorry read code Dave Chinner
2012-10-11 21:48   ` Christoph Hellwig
2012-10-09  3:51 ` [PATCH 12/19] xfs: factor dir2 block read operations Dave Chinner
2012-10-09  3:51 ` [PATCH 13/19] xfs: verify dir2 block format buffers Dave Chinner
2012-10-09  3:51 ` [PATCH 14/19] xfs: factor dir2 free block reading Dave Chinner
2012-10-09  3:51 ` [PATCH 15/19] xfs: factor out dir2 data " Dave Chinner
2012-10-09  3:51 ` [PATCH 16/19] xfs: factor dir2 leaf read Dave Chinner
2012-10-09  3:51 ` [PATCH 17/19] xfs: factor and verify attr leaf reads Dave Chinner
2012-10-09  3:51 ` [PATCH 18/19] xfs: add xfs_da_node verification Dave Chinner
2012-10-09  3:51 ` [PATCH 19/19] xfs: Add verifiers to dir2 data readahead Dave Chinner
2012-10-11 12:09 ` [PATCH 00/19] xfs: buffer read verifier infrastructure Mark Tinguely
2012-10-11 21:42   ` Dave Chinner

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=1349754670-32009-2-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox