Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80aa76bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more xfs updates from Darrick Wong:
 "Most of these are code cleanups, but there are a couple of notable
  use-after-free bug fixes.

  This series has been run through a full xfstests run over the week and
  through a quick xfstests run against this morning's master, with no
  major failures reported.

   - clean up unnecessary function call parameters

   - fix a use-after-free bug when aborting logging intents

   - refactor filestreams state data to avoid use-after-free bug

   - fix incorrect removal of cow extents when truncating extended
     attributes.

   - refactor open-coded __set_page_dirty in favor of using vfs
     function.

   - fix a deadlock when fstrim and fs shutdown race"

* tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  Force log to disk before reading the AGF during a fstrim
  Export __set_page_dirty
  xfs: only cancel cow blocks when truncating the data fork
  xfs: non-scrub - remove unused function parameters
  xfs: remove filestream item xfs_inode reference
  xfs: fix intent use-after-free on abort
  xfs: Remove "committed" argument of xfs_dir_ialloc
parents 4ac1800f 8c81dd46

fs/xfs/libxfs/xfs_alloc.c

+2 −4
Original line number Diff line number Diff line
@@ -1947,7 +1947,7 @@ void 
xfs_alloc_compute_maxlevels(

	xfs_mount_t	*mp)	/* file system mount structure */

{

	mp->m_ag_maxlevels = xfs_btree_compute_maxlevels(mp, mp->m_alloc_mnr,

	mp->m_ag_maxlevels = xfs_btree_compute_maxlevels(mp->m_alloc_mnr,

			(mp->m_sb.sb_agblocks + 1) / 2);

}
@@ -1959,7 +1959,6 @@ xfs_alloc_compute_maxlevels( 
 */

xfs_extlen_t

xfs_alloc_longest_free_extent(

	struct xfs_mount	*mp,

	struct xfs_perag	*pag,

	xfs_extlen_t		need,

	xfs_extlen_t		reserved)
@@ -2038,8 +2037,7 @@ xfs_alloc_space_available( 


	/* do we have enough contiguous free space for the allocation? */

	alloc_len = args->minlen + (args->alignment - 1) + args->minalignslop;

	longest = xfs_alloc_longest_free_extent(args->mp, pag, min_free,

			reservation);

	longest = xfs_alloc_longest_free_extent(pag, min_free, reservation);

	if (longest < alloc_len)

		return false;

fs/xfs/libxfs/xfs_alloc.h

+2 −3
Original line number Diff line number Diff line
@@ -116,9 +116,8 @@ xfs_alloc_allow_busy_reuse(int datatype) 
unsigned int xfs_alloc_set_aside(struct xfs_mount *mp);

unsigned int xfs_alloc_ag_max_usable(struct xfs_mount *mp);



xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_mount *mp,

		struct xfs_perag *pag, xfs_extlen_t need,

		xfs_extlen_t reserved);

xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_perag *pag,

		xfs_extlen_t need, xfs_extlen_t reserved);

unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,

		struct xfs_perag *pag);

fs/xfs/libxfs/xfs_bmap.c

+1 −2
Original line number Diff line number Diff line
@@ -3225,7 +3225,7 @@ xfs_bmap_longest_free_extent( 
		}

	}



	longest = xfs_alloc_longest_free_extent(mp, pag,

	longest = xfs_alloc_longest_free_extent(pag,

				xfs_alloc_min_freelist(mp, pag),

				xfs_ag_resv_needed(pag, XFS_AG_RESV_NONE));

	if (*blen < longest)
@@ -5667,7 +5667,6 @@ xfs_bmap_collapse_extents( 
	xfs_fileoff_t		*next_fsb,

	xfs_fileoff_t		offset_shift_fsb,

	bool			*done,

	xfs_fileoff_t		stop_fsb,

	xfs_fsblock_t		*firstblock,

	struct xfs_defer_ops	*dfops)

{

fs/xfs/libxfs/xfs_bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void xfs_bmap_del_extent_cow(struct xfs_inode *ip, 
uint	xfs_default_attroffset(struct xfs_inode *ip);

int	xfs_bmap_collapse_extents(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,

		bool *done, xfs_fileoff_t stop_fsb, xfs_fsblock_t *firstblock,

		bool *done, xfs_fsblock_t *firstblock,

		struct xfs_defer_ops *dfops);

int	xfs_bmap_insert_extents(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,

fs/xfs/libxfs/xfs_btree.c

+0 −2
Original line number Diff line number Diff line
@@ -4531,7 +4531,6 @@ xfs_btree_sblock_verify( 
 */

uint

xfs_btree_compute_maxlevels(

	struct xfs_mount	*mp,

	uint			*limits,

	unsigned long		len)

{
@@ -4839,7 +4838,6 @@ xfs_btree_query_all( 
 */

xfs_extlen_t

xfs_btree_calc_size(

	struct xfs_mount	*mp,

	uint			*limits,

	unsigned long long	len)

{