Commit 7c5cac1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs fixes from Darrick Wong:
 "Here are a few more bug fixes & cleanups for 4.15-rc4:

   - clean up duplicate includes

   - remove ancient 'no-alloc' crap code that occasionally caused hard
     fs shutdowns due to lack of proper space reservations

   - fix regression in FIEMAP behavior when reporting xattr extents"

* tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: make iomap_begin functions trim iomaps consistently
  xfs: remove "no-allocation" reservations for file creations
  fs: xfs: remove duplicate includes
parents 4e746cf4 b7e0b6ff

fs/xfs/libxfs/xfs_ialloc.c

+3 −7
Original line number Diff line number Diff line
@@ -920,8 +920,7 @@ STATIC xfs_agnumber_t 
xfs_ialloc_ag_select(

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_ino_t	parent,		/* parent directory inode number */

	umode_t		mode,		/* bits set to indicate file type */

	int		okalloc)	/* ok to allocate more space */

	umode_t		mode)		/* bits set to indicate file type */

{

	xfs_agnumber_t	agcount;	/* number of ag's in the filesystem */

	xfs_agnumber_t	agno;		/* current ag number */
@@ -978,9 +977,6 @@ xfs_ialloc_ag_select( 
			return agno;

		}



		if (!okalloc)

			goto nextag;



		if (!pag->pagf_init) {

			error = xfs_alloc_pagf_init(mp, tp, agno, flags);

			if (error)
@@ -1680,7 +1676,6 @@ xfs_dialloc( 
	struct xfs_trans	*tp,

	xfs_ino_t		parent,

	umode_t			mode,

	int			okalloc,

	struct xfs_buf		**IO_agbp,

	xfs_ino_t		*inop)

{
@@ -1692,6 +1687,7 @@ xfs_dialloc( 
	int			noroom = 0;

	xfs_agnumber_t		start_agno;

	struct xfs_perag	*pag;

	int			okalloc = 1;



	if (*IO_agbp) {

		/*
@@ -1707,7 +1703,7 @@ xfs_dialloc( 
	 * We do not have an agbp, so select an initial allocation

	 * group for inode allocation.

	 */

	start_agno = xfs_ialloc_ag_select(tp, parent, mode, okalloc);

	start_agno = xfs_ialloc_ag_select(tp, parent, mode);

	if (start_agno == NULLAGNUMBER) {

		*inop = NULLFSINO;

		return 0;

fs/xfs/libxfs/xfs_ialloc.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ xfs_dialloc( 
	struct xfs_trans *tp,		/* transaction pointer */

	xfs_ino_t	parent,		/* parent inode (directory) */

	umode_t		mode,		/* mode bits for new inode */

	int		okalloc,	/* ok to allocate more space */

	struct xfs_buf	**agbp,		/* buf for a.g. inode header */

	xfs_ino_t	*inop);		/* inode number allocated */

fs/xfs/scrub/scrub.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/trace.h"

#include "scrub/scrub.h"

#include "scrub/btree.h"



/*

fs/xfs/scrub/trace.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_da_format.h"

#include "xfs_defer.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_trans.h"

fs/xfs/xfs_inode.c

+7 −26
Original line number Diff line number Diff line
@@ -749,7 +749,6 @@ xfs_ialloc( 
	xfs_nlink_t	nlink,

	dev_t		rdev,

	prid_t		prid,

	int		okalloc,

	xfs_buf_t	**ialloc_context,

	xfs_inode_t	**ipp)

{
@@ -765,7 +764,7 @@ xfs_ialloc( 
	 * Call the space management code to pick

	 * the on-disk inode to be allocated.

	 */

	error = xfs_dialloc(tp, pip ? pip->i_ino : 0, mode, okalloc,

	error = xfs_dialloc(tp, pip ? pip->i_ino : 0, mode,

			    ialloc_context, &ino);

	if (error)

		return error;
@@ -957,7 +956,6 @@ xfs_dir_ialloc( 
	xfs_nlink_t	nlink,

	dev_t		rdev,

	prid_t		prid,		/* project id */

	int		okalloc,	/* ok to allocate new space */

	xfs_inode_t	**ipp,		/* pointer to inode; it will be

					   locked. */

	int		*committed)
@@ -988,8 +986,8 @@ xfs_dir_ialloc( 
	 * transaction commit so that no other process can steal

	 * the inode(s) that we've just allocated.

	 */

	code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid, okalloc,

			  &ialloc_context, &ip);

	code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid, &ialloc_context,

			&ip);



	/*

	 * Return an error if we were unable to allocate a new inode.
@@ -1061,7 +1059,7 @@ xfs_dir_ialloc( 
		 * this call should always succeed.

		 */

		code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid,

				  okalloc, &ialloc_context, &ip);

				  &ialloc_context, &ip);



		/*

		 * If we get an error at this point, return to the caller
@@ -1182,11 +1180,6 @@ xfs_create( 
		xfs_flush_inodes(mp);

		error = xfs_trans_alloc(mp, tres, resblks, 0, 0, &tp);

	}

	if (error == -ENOSPC) {

		/* No space at all so try a "no-allocation" reservation */

		resblks = 0;

		error = xfs_trans_alloc(mp, tres, 0, 0, 0, &tp);

	}

	if (error)

		goto out_release_inode;
@@ -1203,19 +1196,13 @@ xfs_create( 
	if (error)

		goto out_trans_cancel;



	if (!resblks) {

		error = xfs_dir_canenter(tp, dp, name);

		if (error)

			goto out_trans_cancel;

	}



	/*

	 * A newly created regular or special file just has one directory

	 * entry pointing to them, but a directory also the "." entry

	 * pointing to itself.

	 */

	error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev,

			       prid, resblks > 0, &ip, NULL);

	error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev, prid, &ip,

			NULL);

	if (error)

		goto out_trans_cancel;
@@ -1340,11 +1327,6 @@ xfs_create_tmpfile( 
	tres = &M_RES(mp)->tr_create_tmpfile;



	error = xfs_trans_alloc(mp, tres, resblks, 0, 0, &tp);

	if (error == -ENOSPC) {

		/* No space at all so try a "no-allocation" reservation */

		resblks = 0;

		error = xfs_trans_alloc(mp, tres, 0, 0, 0, &tp);

	}

	if (error)

		goto out_release_inode;
@@ -1353,8 +1335,7 @@ xfs_create_tmpfile( 
	if (error)

		goto out_trans_cancel;



	error = xfs_dir_ialloc(&tp, dp, mode, 1, 0,

				prid, resblks > 0, &ip, NULL);

	error = xfs_dir_ialloc(&tp, dp, mode, 1, 0, prid, &ip, NULL);

	if (error)

		goto out_trans_cancel;

CRA Git | Maintained and supported by SUSTech CRA and CCSE