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

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

[Wang Sheng-Hui]

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@foxmail.com>
---
 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



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

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

[Dave Chinner]

On Sun, Feb 08, 2015 at 12:45:04PM +0800, Wang Sheng-Hui wrote:
> 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@foxmail.com>

The comment is old and redundant. The error messages document the
reason for the checks better than the comment and the comments about
volume mounts date back to Irix and so aren't relevant any more. So
just remove the comment.

> ---
>  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 */

No need to add a redundant comment - it is obvious what the code it
refers to is checking.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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