mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
ea01221f95
commit881f78f472upstream. [backport: resolve merge conflicts due to refactoring rtbitmap/summary macros and accessors] I mistakenly turned off CONFIG_XFS_RT in the Kconfig file for arm64 variant of the djwong-wtf git branch. Unfortunately, it took me a good hour to figure out that RT wasn't built because this is what got printed to dmesg: XFS (sda2): realtime geometry sanity check failed XFS (sda2): Metadata corruption detected at xfs_sb_read_verify+0x170/0x190 [xfs], xfs_sb block 0x0 Whereas I would have expected: XFS (sda2): Not built with CONFIG_XFS_RT XFS (sda2): RT mount failed The root cause of these problems is the conditional compilation of the new functions xfs_validate_rtextents and xfs_compute_rextslog that I introduced in the two commits listed below. The !RT versions of these functions return false and 0, respectively, which causes primary superblock validation to fail, which explains the first message. Move the two functions to other parts of libxfs that are not conditionally defined by CONFIG_XFS_RT and remove the broken stubs so that validation works again. Fixes:e14293803f("xfs: don't allow overly small or large realtime volumes") Fixes:a6a38f309a("xfs: make rextslog computation consistent with mkfs") Signed-off-by: "Darrick J. Wong" <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com> Acked-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
43 lines
1.4 KiB
C
43 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*/
|
|
#ifndef __XFS_SB_H__
|
|
#define __XFS_SB_H__
|
|
|
|
struct xfs_mount;
|
|
struct xfs_sb;
|
|
struct xfs_dsb;
|
|
struct xfs_trans;
|
|
struct xfs_fsop_geom;
|
|
struct xfs_perag;
|
|
|
|
extern void xfs_log_sb(struct xfs_trans *tp);
|
|
extern int xfs_sync_sb(struct xfs_mount *mp, bool wait);
|
|
extern int xfs_sync_sb_buf(struct xfs_mount *mp);
|
|
extern void xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp);
|
|
extern void xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from);
|
|
extern void xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from);
|
|
extern void xfs_sb_quota_from_disk(struct xfs_sb *sbp);
|
|
extern bool xfs_sb_good_version(struct xfs_sb *sbp);
|
|
extern uint64_t xfs_sb_version_to_features(struct xfs_sb *sbp);
|
|
|
|
extern int xfs_update_secondary_sbs(struct xfs_mount *mp);
|
|
|
|
#define XFS_FS_GEOM_MAX_STRUCT_VER (5)
|
|
extern void xfs_fs_geometry(struct xfs_mount *mp, struct xfs_fsop_geom *geo,
|
|
int struct_version);
|
|
extern int xfs_sb_read_secondary(struct xfs_mount *mp,
|
|
struct xfs_trans *tp, xfs_agnumber_t agno,
|
|
struct xfs_buf **bpp);
|
|
extern int xfs_sb_get_secondary(struct xfs_mount *mp,
|
|
struct xfs_trans *tp, xfs_agnumber_t agno,
|
|
struct xfs_buf **bpp);
|
|
|
|
extern bool xfs_validate_stripe_geometry(struct xfs_mount *mp,
|
|
__s64 sunit, __s64 swidth, int sectorsize, bool silent);
|
|
|
|
uint8_t xfs_compute_rextslog(xfs_rtbxlen_t rtextents);
|
|
|
|
#endif /* __XFS_SB_H__ */
|