diff options
| author | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
| commit | 2d31cd571e6f2ac61a3eda273d973058e1bb1f58 (patch) | |
| tree | 640893fdb9ce69915cde3f189cff835ce4d6c3fa /fs/xfs/libxfs/xfs_sb.c | |
| parent | 24e62728b3fc4f118c8ae17b374bce189bb188fc (diff) | |
| parent | 1d074db69c46d62ce82b331c2080e2fcb710bf4a (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.yraspberrypi-kernel_1.20160921-1
Diffstat (limited to 'fs/xfs/libxfs/xfs_sb.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index 8a53eaa349f4..7088be6afb3c 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -581,7 +581,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); } |