Commit a0b96314 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.11-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Darrick Wong:
 "In this release we add the ability to set a 'needsrepair' flag
  indicating that we /know/ the filesystem requires xfs_repair, but
  other than that, it's the usual strengthening of metadata validation
  and miscellaneous cleanups.

  Summary:

   - Introduce a "needsrepair" "feature" to flag a filesystem as needing
     a pass through xfs_repair. This is key to enabling filesystem
     upgrades (in xfs_db) that require xfs_repair to make minor
     adjustments to metadata.

   - Refactor parameter checking of recovered log intent items so that
     we actually use the same validation code as them that generate the
     intent items.

   - Various fixes to online scrub not reacting correctly to directory
     entries pointing to inodes that cannot be igetted.

   - Refactor validation helpers for data and rt volume extents.

   - Refactor XFS_TRANS_DQ_DIRTY out of existence.

   - Fix a longstanding bug where mounting with "uqnoenforce" would
     start user quotas in non-enforcing mode but /proc/mounts would
     display "usrquota", implying that they are being enforced.

   - Don't flag dax+reflink inodes as corruption since that is a valid
     (but not fully functional) combination right now.

   - Clean up raid stripe validation functions.

   - Refactor the inode allocation code to be more straightforward.

   - Small prep cleanup for idmapping support.

   - Get rid of the xfs_buf_t typedef"

* tag 'xfs-5.11-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (40 commits)
  xfs: remove xfs_buf_t typedef
  fs/xfs: convert comma to semicolon
  xfs: open code updating i_mode in xfs_set_acl
  xfs: remove xfs_vn_setattr_nonsize
  xfs: kill ialloced in xfs_dialloc()
  xfs: spilt xfs_dialloc() into 2 functions
  xfs: move xfs_dialloc_roll() into xfs_dialloc()
  xfs: move on-disk inode allocation out of xfs_ialloc()
  xfs: introduce xfs_dialloc_roll()
  xfs: convert noroom, okalloc in xfs_dialloc() to bool
  xfs: don't catch dax+reflink inodes as corruption in verifier
  xfs: fix the forward progress assertion in xfs_iwalk_run_callbacks
  xfs: remove unneeded return value check for *init_cursor()
  xfs: introduce xfs_validate_stripe_geometry()
  xfs: show the proper user quota options
  xfs: remove the unused XFS_B_FSB_OFFSET macro
  xfs: remove unnecessary null check in xfs_generic_create
  xfs: directly return if the delta equal to zero
  xfs: check tp->t_dqinfo value instead of the XFS_TRANS_DQ_DIRTY flag
  xfs: delete duplicated tp->t_dqinfo null check and allocation
  ...
parents 4862c741 e8222613

fs/xfs/libxfs/xfs_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -690,9 +690,9 @@ xfs_alloc_read_agfl( 
	xfs_mount_t	*mp,		/* mount point structure */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_buf_t	**bpp)		/* buffer for the ag free block array */

	struct xfs_buf	**bpp)		/* buffer for the ag free block array */

{

	xfs_buf_t	*bp;		/* return value */

	struct xfs_buf	*bp;		/* return value */

	int		error;



	ASSERT(agno != NULLAGNUMBER);
@@ -2647,12 +2647,12 @@ xfs_alloc_fix_freelist( 
int				/* error */

xfs_alloc_get_freelist(

	xfs_trans_t	*tp,	/* transaction pointer */

	xfs_buf_t	*agbp,	/* buffer containing the agf structure */

	struct xfs_buf	*agbp,	/* buffer containing the agf structure */

	xfs_agblock_t	*bnop,	/* block address retrieved from freelist */

	int		btreeblk) /* destination is a AGF btree */

{

	struct xfs_agf	*agf = agbp->b_addr;

	xfs_buf_t	*agflbp;/* buffer for a.g. freelist structure */

	struct xfs_buf	*agflbp;/* buffer for a.g. freelist structure */

	xfs_agblock_t	bno;	/* block number returned */

	__be32		*agfl_bno;

	int		error;
@@ -2711,7 +2711,7 @@ xfs_alloc_get_freelist( 
void

xfs_alloc_log_agf(

	xfs_trans_t	*tp,	/* transaction pointer */

	xfs_buf_t	*bp,	/* buffer for a.g. freelist header */

	struct xfs_buf	*bp,	/* buffer for a.g. freelist header */

	int		fields)	/* mask of fields to be logged (XFS_AGF_...) */

{

	int	first;		/* first byte offset */
@@ -2757,7 +2757,7 @@ xfs_alloc_pagf_init( 
	xfs_agnumber_t		agno,	/* allocation group number */

	int			flags)	/* XFS_ALLOC_FLAGS_... */

{

	xfs_buf_t		*bp;

	struct xfs_buf		*bp;

	int			error;



	error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp);
@@ -2772,8 +2772,8 @@ xfs_alloc_pagf_init( 
int					/* error */

xfs_alloc_put_freelist(

	xfs_trans_t		*tp,	/* transaction pointer */

	xfs_buf_t		*agbp,	/* buffer for a.g. freelist header */

	xfs_buf_t		*agflbp,/* buffer for a.g. free block array */

	struct xfs_buf		*agbp,	/* buffer for a.g. freelist header */

	struct xfs_buf		*agflbp,/* buffer for a.g. free block array */

	xfs_agblock_t		bno,	/* block being freed */

	int			btreeblk) /* block came from a AGF btree */

{

fs/xfs/libxfs/xfs_bmap.c

+11 −17
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ xfs_bmap_check_leaf_extents( 
	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_btree_block	*block;	/* current btree block */

	xfs_fsblock_t		bno;	/* block # of "block" */

	xfs_buf_t		*bp;	/* buffer for "block" */

	struct xfs_buf		*bp;	/* buffer for "block" */

	int			error;	/* error return value */

	xfs_extnum_t		i=0, j;	/* index into the extents list */

	int			level;	/* btree level, for checking */
@@ -592,7 +592,7 @@ xfs_bmap_btree_to_extents( 
	struct xfs_btree_block	*rblock = ifp->if_broot;

	struct xfs_btree_block	*cblock;/* child btree block */

	xfs_fsblock_t		cbno;	/* child block number */

	xfs_buf_t		*cbp;	/* child block's buffer */

	struct xfs_buf		*cbp;	/* child block's buffer */

	int			error;	/* error return value */

	__be64			*pp;	/* ptr to block address */

	struct xfs_owner_info	oinfo;
@@ -830,7 +830,7 @@ xfs_bmap_local_to_extents( 
	int		flags;		/* logging flags returned */

	struct xfs_ifork *ifp;		/* inode fork pointer */

	xfs_alloc_arg_t	args;		/* allocation arguments */

	xfs_buf_t	*bp;		/* buffer for extent block */

	struct xfs_buf	*bp;		/* buffer for extent block */

	struct xfs_bmbt_irec rec;

	struct xfs_iext_cursor icur;
@@ -6226,23 +6226,17 @@ xfs_bmap_validate_extent( 
	struct xfs_bmbt_irec	*irec)

{

	struct xfs_mount	*mp = ip->i_mount;

	xfs_fsblock_t		endfsb;

	bool			isrt;



	isrt = XFS_IS_REALTIME_INODE(ip);

	endfsb = irec->br_startblock + irec->br_blockcount - 1;

	if (isrt && whichfork == XFS_DATA_FORK) {

		if (!xfs_verify_rtbno(mp, irec->br_startblock))

	if (!xfs_verify_fileext(mp, irec->br_startoff, irec->br_blockcount))

		return __this_address;

		if (!xfs_verify_rtbno(mp, endfsb))



	if (XFS_IS_REALTIME_INODE(ip) && whichfork == XFS_DATA_FORK) {

		if (!xfs_verify_rtext(mp, irec->br_startblock,

					  irec->br_blockcount))

			return __this_address;

	} else {

		if (!xfs_verify_fsbno(mp, irec->br_startblock))

			return __this_address;

		if (!xfs_verify_fsbno(mp, endfsb))

			return __this_address;

		if (XFS_FSB_TO_AGNO(mp, irec->br_startblock) !=

		    XFS_FSB_TO_AGNO(mp, endfsb))

		if (!xfs_verify_fsbext(mp, irec->br_startblock,

					   irec->br_blockcount))

			return __this_address;

	}

	if (irec->br_state != XFS_EXT_NORM && whichfork != XFS_DATA_FORK)

fs/xfs/libxfs/xfs_bmap_btree.c

+0 −2
Original line number Diff line number Diff line
@@ -639,8 +639,6 @@ xfs_bmbt_change_owner( 
	ASSERT(XFS_IFORK_PTR(ip, whichfork)->if_format == XFS_DINODE_FMT_BTREE);



	cur = xfs_bmbt_init_cursor(ip->i_mount, tp, ip, whichfork);

	if (!cur)

		return -ENOMEM;

	cur->bc_ino.flags |= XFS_BTCUR_BMBT_INVALID_OWNER;



	error = xfs_btree_change_owner(cur, new_owner, buffer_list);

fs/xfs/libxfs/xfs_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ xfs_btree_dup_cursor( 
	xfs_btree_cur_t	*cur,		/* input cursor */

	xfs_btree_cur_t	**ncur)		/* output cursor */

{

	xfs_buf_t	*bp;		/* btree block's buffer pointer */

	struct xfs_buf	*bp;		/* btree block's buffer pointer */

	int		error;		/* error return value */

	int		i;		/* level number of btree block */

	xfs_mount_t	*mp;		/* mount structure for filesystem */
@@ -701,7 +701,7 @@ xfs_btree_firstrec( 
	int			level)	/* level to change */

{

	struct xfs_btree_block	*block;	/* generic btree block pointer */

	xfs_buf_t		*bp;	/* buffer containing block */

	struct xfs_buf		*bp;	/* buffer containing block */



	/*

	 * Get the block pointer for this level.
@@ -731,7 +731,7 @@ xfs_btree_lastrec( 
	int			level)	/* level to change */

{

	struct xfs_btree_block	*block;	/* generic btree block pointer */

	xfs_buf_t		*bp;	/* buffer containing block */

	struct xfs_buf		*bp;	/* buffer containing block */



	/*

	 * Get the block pointer for this level.
@@ -993,7 +993,7 @@ STATIC void 
xfs_btree_setbuf(

	xfs_btree_cur_t		*cur,	/* btree cursor */

	int			lev,	/* level in btree */

	xfs_buf_t		*bp)	/* new buffer to set */

	struct xfs_buf		*bp)	/* new buffer to set */

{

	struct xfs_btree_block	*b;	/* btree block */
@@ -1636,7 +1636,7 @@ xfs_btree_decrement( 
	int			*stat)		/* success/failure */

{

	struct xfs_btree_block	*block;

	xfs_buf_t		*bp;

	struct xfs_buf		*bp;

	int			error;		/* error return value */

	int			lev;

	union xfs_btree_ptr	ptr;
@@ -4070,7 +4070,7 @@ xfs_btree_delrec( 
	 * surviving block, and log it.

	 */

	xfs_btree_set_numrecs(left, lrecs + rrecs);

	xfs_btree_get_sibling(cur, right, &cptr, XFS_BB_RIGHTSIB),

	xfs_btree_get_sibling(cur, right, &cptr, XFS_BB_RIGHTSIB);

	xfs_btree_set_sibling(cur, left, &cptr, XFS_BB_RIGHTSIB);

	xfs_btree_log_block(cur, lbp, XFS_BB_NUMRECS | XFS_BB_RIGHTSIB);

fs/xfs/libxfs/xfs_format.h

+9 −2
Original line number Diff line number Diff line
@@ -468,11 +468,13 @@ xfs_sb_has_ro_compat_feature( 
#define XFS_SB_FEAT_INCOMPAT_SPINODES	(1 << 1)	/* sparse inode chunks */

#define XFS_SB_FEAT_INCOMPAT_META_UUID	(1 << 2)	/* metadata UUID */

#define XFS_SB_FEAT_INCOMPAT_BIGTIME	(1 << 3)	/* large timestamps */

#define XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR (1 << 4)	/* needs xfs_repair */

#define XFS_SB_FEAT_INCOMPAT_ALL \

		(XFS_SB_FEAT_INCOMPAT_FTYPE|	\

		 XFS_SB_FEAT_INCOMPAT_SPINODES|	\

		 XFS_SB_FEAT_INCOMPAT_META_UUID| \

		 XFS_SB_FEAT_INCOMPAT_BIGTIME)

		 XFS_SB_FEAT_INCOMPAT_BIGTIME| \

		 XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR)



#define XFS_SB_FEAT_INCOMPAT_UNKNOWN	~XFS_SB_FEAT_INCOMPAT_ALL

static inline bool
@@ -584,6 +586,12 @@ static inline bool xfs_sb_version_hasinobtcounts(struct xfs_sb *sbp) 
		(sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_INOBTCNT);

}



static inline bool xfs_sb_version_needsrepair(struct xfs_sb *sbp)

{

	return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&

		(sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR);

}



/*

 * end of superblock version macros

 */
@@ -625,7 +633,6 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino) 
#define XFS_B_TO_FSB(mp,b)	\

	((((uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog)

#define XFS_B_TO_FSBT(mp,b)	(((uint64_t)(b)) >> (mp)->m_sb.sb_blocklog)

#define XFS_B_FSB_OFFSET(mp,b)	((b) & (mp)->m_blockmask)



/*

 * Allocation group header