aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/libxfs/xfs_sb.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-09-19 17:38:58 +0800
committerAlex Shi <alex.shi@linaro.org>2016-09-19 17:38:58 +0800
commitb54e5ceb73399ab487b2dff4a8712a33bdeec299 (patch)
tree432db4d71f1e37b9285517423ab5aacd0259c9f2 /fs/xfs/libxfs/xfs_sb.c
parentf830d1995d29610977cb4c65051421d74ea068d4 (diff)
parent7ddc655ad909372848a3e7995e222c2b9224c2e0 (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.09-android
Diffstat (limited to 'fs/xfs/libxfs/xfs_sb.c')
-rw-r--r--fs/xfs/libxfs/xfs_sb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 535bd843f2f4..901f11b30174 100644
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -539,7 +539,8 @@ xfs_sb_verify(
* Only check the in progress field for the primary superblock as
* mkfs.xfs doesn't clear it from secondary superblocks.
*/
- return xfs_mount_validate_sb(mp, &sb, bp->b_bn == XFS_SB_DADDR,
+ return xfs_mount_validate_sb(mp, &sb,
+ bp->b_maps[0].bm_bn == XFS_SB_DADDR,
check_version);
}