linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH] xfs: change xfs_update_secondary_supers to use xfS_sb_read_secondary
Date: Tue, 15 May 2018 13:47:21 -0700	[thread overview]
Message-ID: <20180515204721.GM4933@magnolia> (raw)

From: Darrick J. Wong <darrick.wong@oracle.com>

Use the new helper to read secondary superblocks instead of opencoding
it ourselves.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/xfs_fsops.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 056a76689197..40c131ebf772 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -191,18 +191,15 @@ xfs_growfs_data_private(
  */
 int
 xfs_update_secondary_supers(
-	xfs_mount_t		*mp)
+	struct xfs_mount	*mp)
 {
-	int			error, saved_error;
+	struct xfs_buf		*bp;
 	xfs_agnumber_t		agno;
-	xfs_buf_t		*bp;
+	int			error, saved_error;
 
 	error = saved_error = 0;
 
 	for (agno = 1; agno < mp->m_sb.sb_agcount; agno++) {
-		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, &xfs_sb_buf_ops);
 		/*
 		 * If we get an error reading or writing alternate superblocks,
 		 * continue.  xfs_repair chooses the "best" superblock based
@@ -210,6 +207,7 @@ xfs_update_secondary_supers(
 		 * superblocks un-updated than updated, and xfs_repair may
 		 * pick them over the properly-updated primary.
 		 */
+		error = xfs_sb_read_secondary(mp, NULL, agno, &bp);
 		if (error) {
 			xfs_warn(mp,
 		"error %d reading secondary superblock for ag %d",

             reply	other threads:[~2018-05-15 20:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-15 20:47 Darrick J. Wong [this message]
2018-05-15 20:50 ` [PATCH] xfs: change xfs_update_secondary_supers to use xfS_sb_read_secondary Eric Sandeen
2018-05-15 23:08 ` Dave Chinner
2018-05-15 23:36   ` Darrick J. Wong
2018-05-16  0:23     ` Dave Chinner
2018-05-16  0:41       ` Darrick J. Wong
2018-05-16  1:04         ` 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=20180515204721.GM4933@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@redhat.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;
as well as URLs for NNTP newsgroup(s).