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

Merge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "Fix a few bugs that could lead to corrupt files, fsck complaints, and
  filesystem crashes:

   - Minor documentation fixes

   - Fix a file corruption due to read racing with an insert range
     operation.

   - Fix log reservation overflows when allocating large rt extents

   - Fix a buffer log item flags check

   - Don't allow administrators to mount with sunit= options that will
     cause later xfs_repair complaints about the root directory being
     suspicious because the fs geometry appeared inconsistent

   - Fix a non-static helper that should have been static"

* tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: Make the symbol 'xfs_rtalloc_log_count' static
  xfs: don't commit sunit/swidth updates to disk if that would cause repair failures
  xfs: split the sunit parameter update into two parts
  xfs: refactor agfl length computation function
  libxfs: resync with the userspace libxfs
  xfs: use bitops interface for buf log item AIL flag check
  xfs: fix log reservation overflows when allocating large rt extents
  xfs: stabilize insert range start boundary to avoid COW writeback race
  xfs: fix Sphinx documentation warning
parents a3965607 5084bf6b

fs/xfs/libxfs/xfs_alloc.c

+13 −5
Original line number Diff line number Diff line
@@ -2248,23 +2248,31 @@ xfs_alloc_longest_free_extent( 
	return pag->pagf_flcount > 0 || pag->pagf_longest > 0;

}



/*

 * Compute the minimum length of the AGFL in the given AG.  If @pag is NULL,

 * return the largest possible minimum length.

 */

unsigned int

xfs_alloc_min_freelist(

	struct xfs_mount	*mp,

	struct xfs_perag	*pag)

{

	/* AG btrees have at least 1 level. */

	static const uint8_t	fake_levels[XFS_BTNUM_AGF] = {1, 1, 1};

	const uint8_t		*levels = pag ? pag->pagf_levels : fake_levels;

	unsigned int		min_free;



	ASSERT(mp->m_ag_maxlevels > 0);



	/* space needed by-bno freespace btree */

	min_free = min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_BNOi] + 1,

	min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed by-size freespace btree */

	min_free += min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_CNTi] + 1,

	min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed reverse mapping used space btree */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		min_free += min_t(unsigned int,

				  pag->pagf_levels[XFS_BTNUM_RMAPi] + 1,

		min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1,

						mp->m_rmap_maxlevels);



	return min_free;

fs/xfs/libxfs/xfs_bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -4561,7 +4561,7 @@ xfs_bmapi_convert_delalloc( 
	struct xfs_mount	*mp = ip->i_mount;

	xfs_fileoff_t		offset_fsb = XFS_B_TO_FSBT(mp, offset);

	struct xfs_bmalloca	bma = { NULL };

	u16			flags = 0;

	uint16_t		flags = 0;

	struct xfs_trans	*tp;

	int			error;
@@ -5972,8 +5972,7 @@ xfs_bmap_insert_extents( 
		goto del_cursor;

	}



	if (XFS_IS_CORRUPT(mp,

			   stop_fsb >= got.br_startoff + got.br_blockcount)) {

	if (XFS_IS_CORRUPT(mp, stop_fsb > got.br_startoff)) {

		error = -EFSCORRUPTED;

		goto del_cursor;

	}

fs/xfs/libxfs/xfs_dir2.c

+21 −0
Original line number Diff line number Diff line
@@ -724,3 +724,24 @@ xfs_dir2_namecheck( 
	/* There shouldn't be any slashes or nulls here */

	return !memchr(name, '/', length) && !memchr(name, 0, length);

}



xfs_dahash_t

xfs_dir2_hashname(

	struct xfs_mount	*mp,

	struct xfs_name		*name)

{

	if (unlikely(xfs_sb_version_hasasciici(&mp->m_sb)))

		return xfs_ascii_ci_hashname(name);

	return xfs_da_hashname(name->name, name->len);

}



enum xfs_dacmp

xfs_dir2_compname(

	struct xfs_da_args	*args,

	const unsigned char	*name,

	int			len)

{

	if (unlikely(xfs_sb_version_hasasciici(&args->dp->i_mount->m_sb)))

		return xfs_ascii_ci_compname(args, name, len);

	return xfs_da_compname(args, name, len);

}

fs/xfs/libxfs/xfs_dir2_priv.h

+9 −20
Original line number Diff line number Diff line
@@ -175,6 +175,12 @@ extern int xfs_dir2_sf_lookup(struct xfs_da_args *args); 
extern int xfs_dir2_sf_removename(struct xfs_da_args *args);

extern int xfs_dir2_sf_replace(struct xfs_da_args *args);

extern xfs_failaddr_t xfs_dir2_sf_verify(struct xfs_inode *ip);

int xfs_dir2_sf_entsize(struct xfs_mount *mp,

		struct xfs_dir2_sf_hdr *hdr, int len);

void xfs_dir2_sf_put_ino(struct xfs_mount *mp, struct xfs_dir2_sf_hdr *hdr,

		struct xfs_dir2_sf_entry *sfep, xfs_ino_t ino);

void xfs_dir2_sf_put_ftype(struct xfs_mount *mp,

		struct xfs_dir2_sf_entry *sfep, uint8_t ftype);



/* xfs_dir2_readdir.c */

extern int xfs_readdir(struct xfs_trans *tp, struct xfs_inode *dp,
@@ -194,25 +200,8 @@ xfs_dir2_data_entsize( 
	return round_up(len, XFS_DIR2_DATA_ALIGN);

}



static inline xfs_dahash_t

xfs_dir2_hashname(

	struct xfs_mount	*mp,

	struct xfs_name		*name)

{

	if (unlikely(xfs_sb_version_hasasciici(&mp->m_sb)))

		return xfs_ascii_ci_hashname(name);

	return xfs_da_hashname(name->name, name->len);

}



static inline enum xfs_dacmp

xfs_dir2_compname(

	struct xfs_da_args	*args,

	const unsigned char	*name,

	int			len)

{

	if (unlikely(xfs_sb_version_hasasciici(&args->dp->i_mount->m_sb)))

		return xfs_ascii_ci_compname(args, name, len);

	return xfs_da_compname(args, name, len);

}

xfs_dahash_t xfs_dir2_hashname(struct xfs_mount *mp, struct xfs_name *name);

enum xfs_dacmp xfs_dir2_compname(struct xfs_da_args *args,

		const unsigned char *name, int len);



#endif /* __XFS_DIR2_PRIV_H__ */

fs/xfs/libxfs/xfs_dir2_sf.c

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void xfs_dir2_sf_check(xfs_da_args_t *args); 
static void xfs_dir2_sf_toino4(xfs_da_args_t *args);

static void xfs_dir2_sf_toino8(xfs_da_args_t *args);



static int

int

xfs_dir2_sf_entsize(

	struct xfs_mount	*mp,

	struct xfs_dir2_sf_hdr	*hdr,
@@ -84,7 +84,7 @@ xfs_dir2_sf_get_ino( 
	return get_unaligned_be64(from) & XFS_MAXINUMBER;

}



static void

void

xfs_dir2_sf_put_ino(

	struct xfs_mount		*mp,

	struct xfs_dir2_sf_hdr		*hdr,
@@ -145,7 +145,7 @@ xfs_dir2_sf_get_ftype( 
	return XFS_DIR3_FT_UNKNOWN;

}



static void

void

xfs_dir2_sf_put_ftype(

	struct xfs_mount	*mp,

	struct xfs_dir2_sf_entry *sfep,

CRA Git | Maintained and supported by SUSTech CRA and CCSE