Commit 9e208aa0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs fixes from Darrick Wong:
 "A couple of small code cleanups and bug fixes for rounding errors,
  metadata logging errors, and an extra layer of safeguards against
  leaking memory contents.

   - Fix a rounding error in the fallocate code

   - Minor code cleanups

   - Make sure to zero memory buffers before formatting metadata blocks

   - Fix a few places where we forgot to log an inode metadata update

   - Remove broken error handling that tried to clean up after a failure
     but still got it wrong"

* tag 'xfs-5.4-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: move local to extent inode logging into bmap helper
  xfs: remove broken error handling on failed attr sf to leaf change
  xfs: log the inode on directory sf to block format change
  xfs: assure zeroed memory buffers for certain kmem allocations
  xfs: removed unused error variable from xchk_refcountbt_rec
  xfs: remove unused flags arg from xfs_get_aghdr_buf()
  xfs: Fix tail rounding in xfs_alloc_file_space()
parents fb20da6a aeea4b75

fs/xfs/libxfs/xfs_ag.c

+2 −3
Original line number Diff line number Diff line
@@ -28,12 +28,11 @@ xfs_get_aghdr_buf( 
	struct xfs_mount	*mp,

	xfs_daddr_t		blkno,

	size_t			numblks,

	int			flags,

	const struct xfs_buf_ops *ops)

{

	struct xfs_buf		*bp;



	bp = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, flags);

	bp = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0);

	if (!bp)

		return NULL;
@@ -345,7 +344,7 @@ xfs_ag_init_hdr( 
{

	struct xfs_buf		*bp;



	bp = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, 0, ops);

	bp = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, ops);

	if (!bp)

		return -ENOMEM;

fs/xfs/libxfs/xfs_attr_leaf.c

+3 −18
Original line number Diff line number Diff line
@@ -826,32 +826,17 @@ xfs_attr_shortform_to_leaf( 
	sf = (xfs_attr_shortform_t *)tmpbuffer;



	xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);

	xfs_bmap_local_to_extents_empty(dp, XFS_ATTR_FORK);

	xfs_bmap_local_to_extents_empty(args->trans, dp, XFS_ATTR_FORK);



	bp = NULL;

	error = xfs_da_grow_inode(args, &blkno);

	if (error) {

		/*

		 * If we hit an IO error middle of the transaction inside

		 * grow_inode(), we may have inconsistent data. Bail out.

		 */

		if (error == -EIO)

			goto out;

		xfs_idata_realloc(dp, size, XFS_ATTR_FORK);	/* try to put */

		memcpy(ifp->if_u1.if_data, tmpbuffer, size);	/* it back */

	if (error)

		goto out;

	}



	ASSERT(blkno == 0);

	error = xfs_attr3_leaf_create(args, blkno, &bp);

	if (error) {

		/* xfs_attr3_leaf_create may not have instantiated a block */

		if (bp && (xfs_da_shrink_inode(args, 0, bp) != 0))

			goto out;

		xfs_idata_realloc(dp, size, XFS_ATTR_FORK);	/* try to put */

		memcpy(ifp->if_u1.if_data, tmpbuffer, size);	/* it back */

	if (error)

		goto out;

	}



	memset((char *)&nargs, 0, sizeof(nargs));

	nargs.dp = dp;

fs/xfs/libxfs/xfs_bmap.c

+4 −2
Original line number Diff line number Diff line
@@ -792,6 +792,7 @@ out_root_realloc: 
 */

void

xfs_bmap_local_to_extents_empty(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	int			whichfork)

{
@@ -808,6 +809,7 @@ xfs_bmap_local_to_extents_empty( 
	ifp->if_u1.if_root = NULL;

	ifp->if_height = 0;

	XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

}
@@ -840,7 +842,7 @@ xfs_bmap_local_to_extents( 
	ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL);



	if (!ifp->if_bytes) {

		xfs_bmap_local_to_extents_empty(ip, whichfork);

		xfs_bmap_local_to_extents_empty(tp, ip, whichfork);

		flags = XFS_ILOG_CORE;

		goto done;

	}
@@ -887,7 +889,7 @@ xfs_bmap_local_to_extents( 


	/* account for the change in fork size */

	xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);

	xfs_bmap_local_to_extents_empty(ip, whichfork);

	xfs_bmap_local_to_extents_empty(tp, ip, whichfork);

	flags |= XFS_ILOG_CORE;



	ifp->if_u1.if_root = NULL;

fs/xfs/libxfs/xfs_bmap.h

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ void xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno, 
		xfs_filblks_t len);

int	xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);

int	xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);

void	xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);

void	xfs_bmap_local_to_extents_empty(struct xfs_trans *tp,

		struct xfs_inode *ip, int whichfork);

void	__xfs_bmap_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,

		xfs_filblks_t len, const struct xfs_owner_info *oinfo,

		bool skip_discard);

fs/xfs/libxfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ xfs_dir2_sf_to_block( 
	memcpy(sfp, oldsfp, ifp->if_bytes);



	xfs_idata_realloc(dp, -ifp->if_bytes, XFS_DATA_FORK);

	xfs_bmap_local_to_extents_empty(dp, XFS_DATA_FORK);

	xfs_bmap_local_to_extents_empty(tp, dp, XFS_DATA_FORK);

	dp->i_d.di_size = 0;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE