xfs
[Top] [All Lists]

[PATCH] xfs: move the comment on log device near the right log dev check

To: david@xxxxxxxxxxxxx, xfs@xxxxxxxxxxx, sandeen@xxxxxxxxxxx, hch@xxxxxx, bfoster@xxxxxxxxxx, tinguely@xxxxxxx
Subject: [PATCH] xfs: move the comment on log device near the right log dev check in xfs_mount_validate_sb
From: Wang Sheng-Hui <shhuiw@xxxxxxxxxxx>
Date: Sun, 8 Feb 2015 12:45:04 +0800
Delivered-to: xfs@xxxxxxxxxxx
The beginning is about magic and version number check.
Move the comment on log device near the log dev check logic.

Signed-off-by: Wang Sheng-Hui <shhuiw@xxxxxxxxxxx>
---
 fs/xfs/libxfs/xfs_sb.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 752915f..b4bb852 100644
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -174,20 +174,13 @@ xfs_mount_validate_sb(
        bool            check_inprogress,
        bool            check_version)
 {
+       /* check magic number and version number */
 
-       /*
-        * If the log device and data device have the
-        * same device number, the log is internal.
-        * Consequently, the sb_logstart should be non-zero.  If
-        * we have a zero sb_logstart in this case, we may be trying to mount
-        * a volume filesystem in a non-volume manner.
-        */
        if (sbp->sb_magicnum != XFS_SB_MAGIC) {
                xfs_warn(mp, "bad magic number");
                return -EWRONGFS;
        }
 
-
        if (!xfs_sb_good_version(sbp)) {
                xfs_warn(mp, "bad version");
                return -EWRONGFS;
@@ -245,6 +238,14 @@ xfs_mount_validate_sb(
                        return -EFSCORRUPTED;
        }
 
+       /*
+        * If the log device and data device have the
+        * same device number, the log is internal.
+        * Consequently, the sb_logstart should be non-zero.  If
+        * we have a zero sb_logstart in this case, we may be trying to mount
+        * a volume filesystem in a non-volume manner.
+        */
+
        if (unlikely(
            sbp->sb_logstart == 0 && mp->m_logdev_targp == mp->m_ddev_targp)) {
                xfs_warn(mp,
-- 
2.1.2



<Prev in Thread] Current Thread [Next in Thread>