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

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

Pull xfs fixes from Chandan Babu:

 - Fix memory leak when corruption is detected during scrubbing parent
   pointers

 - Allow SECURE namespace xattrs to use reserved block pool to in order
   to prevent ENOSPC

 - Save stack space by passing tracepoint's char array to file_path()
   instead of another stack variable

 - Remove unused parameter in macro XFS_DQUOT_LOGRES

 - Replace comma with semicolon in a couple of places

* tag 'xfs-6.11-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: convert comma to semicolon
  xfs: convert comma to semicolon
  xfs: remove unused parameter in macro XFS_DQUOT_LOGRES
  xfs: fix file_path handling in tracepoints
  xfs: allow SECURE namespace xattrs to use reserved block pool
  xfs: fix a memory leak
parents 1dd950f2 7bf888fa

fs/xfs/libxfs/xfs_quota_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef uint8_t xfs_dqtype_t; 
 * And, of course, we also need to take into account the dquot log format item

 * used to describe each dquot.

 */

#define XFS_DQUOT_LOGRES(mp)	\

#define XFS_DQUOT_LOGRES	\

	((sizeof(struct xfs_dq_logformat) + sizeof(struct xfs_disk_dquot)) * 6)



#define XFS_IS_QUOTA_ON(mp)		((mp)->m_qflags & XFS_ALL_QUOTA_ACCT)

fs/xfs/libxfs/xfs_trans_resv.c

+14 −14
Original line number Diff line number Diff line
@@ -338,11 +338,11 @@ xfs_calc_write_reservation( 
					blksz);

		t1 += adj;

		t3 += adj;

		return XFS_DQUOT_LOGRES(mp) + max3(t1, t2, t3);

		return XFS_DQUOT_LOGRES + max3(t1, t2, t3);

	}



	t4 = xfs_calc_refcountbt_reservation(mp, 1);

	return XFS_DQUOT_LOGRES(mp) + max(t4, max3(t1, t2, t3));

	return XFS_DQUOT_LOGRES + max(t4, max3(t1, t2, t3));

}



unsigned int
@@ -410,11 +410,11 @@ xfs_calc_itruncate_reservation( 
					xfs_refcountbt_block_count(mp, 4),

					blksz);



		return XFS_DQUOT_LOGRES(mp) + max3(t1, t2, t3);

		return XFS_DQUOT_LOGRES + max3(t1, t2, t3);

	}



	t4 = xfs_calc_refcountbt_reservation(mp, 2);

	return XFS_DQUOT_LOGRES(mp) + max(t4, max3(t1, t2, t3));

	return XFS_DQUOT_LOGRES + max(t4, max3(t1, t2, t3));

}



unsigned int
@@ -466,7 +466,7 @@ STATIC uint 
xfs_calc_rename_reservation(

	struct xfs_mount	*mp)

{

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		t1, t2, t3 = 0;
@@ -577,7 +577,7 @@ STATIC uint 
xfs_calc_link_reservation(

	struct xfs_mount	*mp)

{

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		t1, t2, t3 = 0;
@@ -641,7 +641,7 @@ STATIC uint 
xfs_calc_remove_reservation(

	struct xfs_mount	*mp)

{

	unsigned int            overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int            overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv   *resp = M_RES(mp);

	unsigned int            t1, t2, t3 = 0;
@@ -729,7 +729,7 @@ xfs_calc_icreate_reservation( 
	struct xfs_mount	*mp)

{

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	unsigned int		t1, t2, t3 = 0;



	t1 = xfs_calc_icreate_resv_alloc(mp);
@@ -747,7 +747,7 @@ STATIC uint 
xfs_calc_create_tmpfile_reservation(

	struct xfs_mount        *mp)

{

	uint	res = XFS_DQUOT_LOGRES(mp);

	uint	res = XFS_DQUOT_LOGRES;



	res += xfs_calc_icreate_resv_alloc(mp);

	return res + xfs_calc_iunlink_add_reservation(mp);
@@ -829,7 +829,7 @@ STATIC uint 
xfs_calc_ifree_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

		xfs_calc_iunlink_remove_reservation(mp) +
@@ -846,7 +846,7 @@ STATIC uint 
xfs_calc_ichange_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);
@@ -955,7 +955,7 @@ STATIC uint 
xfs_calc_addafork_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +

		xfs_calc_buf_res(1, mp->m_dir_geo->blksize) +
@@ -1003,7 +1003,7 @@ STATIC uint 
xfs_calc_attrsetm_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +

		xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH, XFS_FSB_TO_B(mp, 1));
@@ -1043,7 +1043,7 @@ STATIC uint 
xfs_calc_attrrm_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		max((xfs_calc_inode_res(mp, 1) +

		     xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH,

				      XFS_FSB_TO_B(mp, 1)) +

fs/xfs/scrub/agheader_repair.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ xrep_agfl_init_header( 
	 * step.

	 */

	xagb_bitmap_init(&af.used_extents);

	af.agfl_bno = xfs_buf_to_agfl_bno(agfl_bp),

	af.agfl_bno = xfs_buf_to_agfl_bno(agfl_bp);

	xagb_bitmap_walk(agfl_extents, xrep_agfl_fill, &af);

	error = xagb_bitmap_disunion(agfl_extents, &af.used_extents);

	if (error)

fs/xfs/scrub/parent.c

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ xchk_parent_pptr( 
	}



	if (pp->sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)

		goto out_pp;

		goto out_names;



	/*

	 * Complain if the number of parent pointers doesn't match the link

fs/xfs/scrub/trace.h

+4 −6
Original line number Diff line number Diff line
@@ -959,18 +959,16 @@ TRACE_EVENT(xfile_create, 
	TP_STRUCT__entry(

		__field(dev_t, dev)

		__field(unsigned long, ino)

		__array(char, pathname, 256)

		__array(char, pathname, MAXNAMELEN)

	),

	TP_fast_assign(

		char		pathname[257];

		char		*path;



		__entry->ino = file_inode(xf->file)->i_ino;

		memset(pathname, 0, sizeof(pathname));

		path = file_path(xf->file, pathname, sizeof(pathname) - 1);

		path = file_path(xf->file, __entry->pathname, MAXNAMELEN);

		if (IS_ERR(path))

			path = "(unknown)";

		strncpy(__entry->pathname, path, sizeof(__entry->pathname));

			strncpy(__entry->pathname, "(unknown)",

					sizeof(__entry->pathname));

	),

	TP_printk("xfino 0x%lx path '%s'",

		  __entry->ino,