From: Brian Foster <bfoster@redhat.com>
To: xfs@oss.sgi.com
Subject: [PATCH v2 1/6] xfs: fix a couple error sequence jumps in xfs_mountfs()
Date: Fri, 27 Jun 2014 08:06:56 -0400 [thread overview]
Message-ID: <1403870821-20143-2-git-send-email-bfoster@redhat.com> (raw)
In-Reply-To: <1403870821-20143-1-git-send-email-bfoster@redhat.com>
xfs_mountfs() has a couple failure conditions that do not jump to the
correct labels. Specifically:
- xfs_initialize_perag_data() failure does not deallocate the log even
though it occurs after log initialization
- xfs_mount_reset_sbqflags() failure returns the error directly rather
than jump to the error sequence
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_mount.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index d5c44a6..4e9dd4a 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -855,7 +855,7 @@ xfs_mountfs(
!mp->m_sb.sb_inprogress) {
error = xfs_initialize_perag_data(mp, sbp->sb_agcount);
if (error)
- goto out_fail_wait;
+ goto out_log_dealloc;;
}
/*
@@ -927,7 +927,7 @@ xfs_mountfs(
xfs_notice(mp, "resetting quota flags");
error = xfs_mount_reset_sbqflags(mp);
if (error)
- return error;
+ goto out_rtunmount;
}
}
--
1.8.3.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-06-27 12:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-27 12:06 [PATCH v2 0/6] xfs sysfs support Brian Foster
2014-06-27 12:06 ` Brian Foster [this message]
2014-06-27 12:06 ` [PATCH v2 2/6] xfs: add a sysfs kset Brian Foster
2014-06-27 12:06 ` [PATCH v2 3/6] xfs: add xfs_mount sysfs kobject Brian Foster
2014-06-28 0:56 ` Dave Chinner
2014-06-27 12:06 ` [PATCH v2 4/6] xfs: add xlog sysfs kobject and attribute handlers Brian Foster
2014-07-10 23:33 ` Dave Chinner
2014-06-27 12:07 ` [PATCH v2 5/6] xfs: add log attributes for log lsn and grant head data Brian Foster
2014-06-27 12:07 ` [PATCH v2 6/6] xfs: document log sysfs attributes in testing ABI Brian Foster
2014-07-10 23:32 ` 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=1403870821-20143-2-git-send-email-bfoster@redhat.com \
--to=bfoster@redhat.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