Commit 1499b8a3 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'guilt/5.19-miscellaneous' into xfs-5.19-for-next

parents 9a5280b3 2d9ac431

fs/xfs/libxfs/xfs_rtbitmap.c

+5 −4
Original line number Diff line number Diff line
@@ -1008,6 +1008,7 @@ xfs_rtfree_extent( 
/* Find all the free records within a given range. */

int

xfs_rtalloc_query_range(

	struct xfs_mount		*mp,

	struct xfs_trans		*tp,

	const struct xfs_rtalloc_rec	*low_rec,

	const struct xfs_rtalloc_rec	*high_rec,
@@ -1015,7 +1016,6 @@ xfs_rtalloc_query_range( 
	void				*priv)

{

	struct xfs_rtalloc_rec		rec;

	struct xfs_mount		*mp = tp->t_mountp;

	xfs_rtblock_t			rtstart;

	xfs_rtblock_t			rtend;

	xfs_rtblock_t			high_key;
@@ -1048,7 +1048,7 @@ xfs_rtalloc_query_range( 
			rec.ar_startext = rtstart;

			rec.ar_extcount = rtend - rtstart + 1;



			error = fn(tp, &rec, priv);

			error = fn(mp, tp, &rec, priv);

			if (error)

				break;

		}
@@ -1062,6 +1062,7 @@ xfs_rtalloc_query_range( 
/* Find all the free records. */

int

xfs_rtalloc_query_all(

	struct xfs_mount		*mp,

	struct xfs_trans		*tp,

	xfs_rtalloc_query_range_fn	fn,

	void				*priv)
@@ -1069,10 +1070,10 @@ xfs_rtalloc_query_all( 
	struct xfs_rtalloc_rec		keys[2];



	keys[0].ar_startext = 0;

	keys[1].ar_startext = tp->t_mountp->m_sb.sb_rextents - 1;

	keys[1].ar_startext = mp->m_sb.sb_rextents - 1;

	keys[0].ar_extcount = keys[1].ar_extcount = 0;



	return xfs_rtalloc_query_range(tp, &keys[0], &keys[1], fn, priv);

	return xfs_rtalloc_query_range(mp, tp, &keys[0], &keys[1], fn, priv);

}



/* Is the given extent all free? */

fs/xfs/libxfs/xfs_sb.c

+5 −0
Original line number Diff line number Diff line
@@ -911,6 +911,11 @@ xfs_log_sb( 
	 * reservations that have been taken out percpu counters. If we have an

	 * unclean shutdown, this will be corrected by log recovery rebuilding

	 * the counters from the AGF block counts.

	 *

	 * Do not update sb_frextents here because it is not part of the lazy

	 * sb counters, despite having a percpu counter. It is always kept

	 * consistent with the ondisk rtbitmap by xfs_trans_apply_sb_deltas()

	 * and hence we don't need have to update it here.

	 */

	if (xfs_has_lazysbcount(mp)) {

		mp->m_sb.sb_icount = percpu_counter_sum(&mp->m_icount);

fs/xfs/scrub/rtbitmap.c

+5 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ xchk_setup_rt( 
/* Scrub a free extent record from the realtime bitmap. */

STATIC int

xchk_rtbitmap_rec(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	const struct xfs_rtalloc_rec *rec,

	void			*priv)
@@ -48,10 +49,10 @@ xchk_rtbitmap_rec( 
	xfs_rtblock_t		startblock;

	xfs_rtblock_t		blockcount;



	startblock = rec->ar_startext * tp->t_mountp->m_sb.sb_rextsize;

	blockcount = rec->ar_extcount * tp->t_mountp->m_sb.sb_rextsize;

	startblock = rec->ar_startext * mp->m_sb.sb_rextsize;

	blockcount = rec->ar_extcount * mp->m_sb.sb_rextsize;



	if (!xfs_verify_rtext(sc->mp, startblock, blockcount))

	if (!xfs_verify_rtext(mp, startblock, blockcount))

		xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);

	return 0;

}
@@ -114,7 +115,7 @@ xchk_rtbitmap( 
	if (error || (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT))

		return error;



	error = xfs_rtalloc_query_all(sc->tp, xchk_rtbitmap_rec, sc);

	error = xfs_rtalloc_query_all(sc->mp, sc->tp, xchk_rtbitmap_rec, sc);

	if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))

		goto out;

fs/xfs/xfs_file.c

+3 −9
Original line number Diff line number Diff line
@@ -694,9 +694,7 @@ xfs_file_buffered_write( 
	struct kiocb		*iocb,

	struct iov_iter		*from)

{

	struct file		*file = iocb->ki_filp;

	struct address_space	*mapping = file->f_mapping;

	struct inode		*inode = mapping->host;

	struct inode		*inode = iocb->ki_filp->f_mapping->host;

	struct xfs_inode	*ip = XFS_I(inode);

	ssize_t			ret;

	bool			cleared_space = false;
@@ -767,9 +765,7 @@ xfs_file_write_iter( 
	struct kiocb		*iocb,

	struct iov_iter		*from)

{

	struct file		*file = iocb->ki_filp;

	struct address_space	*mapping = file->f_mapping;

	struct inode		*inode = mapping->host;

	struct inode		*inode = iocb->ki_filp->f_mapping->host;

	struct xfs_inode	*ip = XFS_I(inode);

	ssize_t			ret;

	size_t			ocount = iov_iter_count(from);
@@ -1167,12 +1163,10 @@ xfs_file_open( 
	struct inode	*inode,

	struct file	*file)

{

	if (!(file->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)

		return -EFBIG;

	if (xfs_is_shutdown(XFS_M(inode->i_sb)))

		return -EIO;

	file->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC;

	return 0;

	return generic_file_open(inode, file);

}



STATIC int

fs/xfs/xfs_fsmap.c

+3 −3
Original line number Diff line number Diff line
@@ -450,11 +450,11 @@ xfs_getfsmap_logdev( 
/* Transform a rtbitmap "record" into a fsmap */

STATIC int

xfs_getfsmap_rtdev_rtbitmap_helper(

	struct xfs_mount		*mp,

	struct xfs_trans		*tp,

	const struct xfs_rtalloc_rec	*rec,

	void				*priv)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_getfsmap_info	*info = priv;

	struct xfs_rmap_irec		irec;

	xfs_daddr_t			rec_daddr;
@@ -535,7 +535,7 @@ xfs_getfsmap_rtdev_rtbitmap_query( 
	do_div(alow.ar_startext, mp->m_sb.sb_rextsize);

	if (do_div(ahigh.ar_startext, mp->m_sb.sb_rextsize))

		ahigh.ar_startext++;

	error = xfs_rtalloc_query_range(tp, &alow, &ahigh,

	error = xfs_rtalloc_query_range(mp, tp, &alow, &ahigh,

			xfs_getfsmap_rtdev_rtbitmap_helper, info);

	if (error)

		goto err;
@@ -547,7 +547,7 @@ xfs_getfsmap_rtdev_rtbitmap_query( 
	info->last = true;

	ahigh.ar_startext = min(mp->m_sb.sb_rextents, ahigh.ar_startext);



	error = xfs_getfsmap_rtdev_rtbitmap_helper(tp, &ahigh, info);

	error = xfs_getfsmap_rtdev_rtbitmap_helper(mp, tp, &ahigh, info);

	if (error)

		goto err;

err: