]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: fix check on struct_version for versions 4 or greater
authorColin Ian King <colin.king@canonical.com>
Tue, 27 Feb 2018 04:43:18 +0000 (22:43 -0600)
committerEric Sandeen <sandeen@redhat.com>
Tue, 27 Feb 2018 04:43:18 +0000 (22:43 -0600)
Source kernel commit: a8789a5ae28f69d7f3791a0e74f8c44222f3108b

It appears that the check for versions 4 or more is incorrect and is
off-by-one. Fix this.

Detected by CoverityScan, CID#1463775 ("Logically dead code")

Fixes: ac503a4cc9e8 ("xfs: refactor the geometry structure filling function")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/xfs_sb.c

index 1aeb6b034e90eacb806faa0818d4015845eaf856..57c88d220ed92776fe91bd2226411c9e04019a97 100644 (file)
@@ -933,7 +933,7 @@ xfs_fs_geometry(
        geo->rtsectsize = sbp->sb_blocksize;
        geo->dirblocksize = xfs_dir2_dirblock_bytes(sbp);
 
-       if (struct_version < 3)
+       if (struct_version < 4)
                return 0;
 
        if (xfs_sb_version_haslogv2(sbp))