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

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

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

Pul xfs updates from Dave Chinner:
 "There's not a huge amount of change in this cycle - Darrick has been
  out of action for a couple of months (hence me sending the last few
  pull requests), so we decided a quiet cycle mainly focussed on bug
  fixes was a good idea. Darrick will take the helm again at the end of
  this merge window.

  FYI, I may be sending another update later in the cycle - there's a
  pending rework of the clone/dedupe_file_range code that fixes numerous
  bugs that is spread amongst the VFS, XFS and ocfs2 code. It has been
  reviewed and tested, Al and I just need to work out the details of the
  merge, so it may come from him rather than me.

  Summary:

   - only support filesystems with unwritten extents

   - add definition for statfs XFS magic number

   - remove unused parameters around reflink code

   - more debug for dangling delalloc extents

   - cancel COW extents on extent swap targets

   - fix quota stats output and clean up the code

   - refactor some of the attribute code in preparation for parent
     pointers

   - fix several buffer handling bugs"

* tag 'xfs-4.20-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (21 commits)
  xfs: cancel COW blocks before swapext
  xfs: clear ail delwri queued bufs on unmount of shutdown fs
  xfs: use offsetof() in place of offset macros for __xfsstats
  xfs: Fix xqmstats offsets in /proc/fs/xfs/xqmstat
  xfs: fix use-after-free race in xfs_buf_rele
  xfs: Add attibute remove and helper functions
  xfs: Add attibute set and helper functions
  xfs: Add helper function xfs_attr_try_sf_addname
  xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h
  xfs: issue log message on user force shutdown
  xfs: fix buffer state management in xrep_findroot_block
  xfs: always assign buffer verifiers when one is provided
  xfs: xrep_findroot_block should reject root blocks with siblings
  xfs: add a define for statfs magic to uapi
  xfs: print dangling delalloc extents
  xfs: fix fork selection in xfs_find_trim_cow_extent
  xfs: remove the unused trimmed argument from xfs_reflink_trim_around_shared
  xfs: remove the unused shared argument to xfs_reflink_reserve_cow
  xfs: handle zeroing in xfs_file_iomap_begin_delay
  xfs: remove suport for filesystems without unwritten extent flag
  ...
parents bfd93a87 96987eea

fs/xfs/libxfs/xfs_attr.c

+136 −100
Original line number Diff line number Diff line
@@ -191,6 +191,128 @@ xfs_attr_calc_size( 
	return nblks;

}



STATIC int

xfs_attr_try_sf_addname(

	struct xfs_inode	*dp,

	struct xfs_da_args	*args)

{



	struct xfs_mount	*mp = dp->i_mount;

	int			error, error2;



	error = xfs_attr_shortform_addname(args);

	if (error == -ENOSPC)

		return error;



	/*

	 * Commit the shortform mods, and we're done.

	 * NOTE: this is also the error path (EEXIST, etc).

	 */

	if (!error && (args->flags & ATTR_KERNOTIME) == 0)

		xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);



	if (mp->m_flags & XFS_MOUNT_WSYNC)

		xfs_trans_set_sync(args->trans);



	error2 = xfs_trans_commit(args->trans);

	args->trans = NULL;

	return error ? error : error2;

}



/*

 * Set the attribute specified in @args.

 */

int

xfs_attr_set_args(

	struct xfs_da_args	*args,

	struct xfs_buf          **leaf_bp)

{

	struct xfs_inode	*dp = args->dp;

	int			error;



	/*

	 * If the attribute list is non-existent or a shortform list,

	 * upgrade it to a single-leaf-block attribute list.

	 */

	if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL ||

	    (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS &&

	     dp->i_d.di_anextents == 0)) {



		/*

		 * Build initial attribute list (if required).

		 */

		if (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS)

			xfs_attr_shortform_create(args);



		/*

		 * Try to add the attr to the attribute list in the inode.

		 */

		error = xfs_attr_try_sf_addname(dp, args);

		if (error != -ENOSPC)

			return error;



		/*

		 * It won't fit in the shortform, transform to a leaf block.

		 * GROT: another possible req'mt for a double-split btree op.

		 */

		error = xfs_attr_shortform_to_leaf(args, leaf_bp);

		if (error)

			return error;



		/*

		 * Prevent the leaf buffer from being unlocked so that a

		 * concurrent AIL push cannot grab the half-baked leaf

		 * buffer and run into problems with the write verifier.

		 */

		xfs_trans_bhold(args->trans, *leaf_bp);



		error = xfs_defer_finish(&args->trans);

		if (error)

			return error;



		/*

		 * Commit the leaf transformation.  We'll need another

		 * (linked) transaction to add the new attribute to the

		 * leaf.

		 */

		error = xfs_trans_roll_inode(&args->trans, dp);

		if (error)

			return error;

		xfs_trans_bjoin(args->trans, *leaf_bp);

		*leaf_bp = NULL;

	}



	if (xfs_bmap_one_block(dp, XFS_ATTR_FORK))

		error = xfs_attr_leaf_addname(args);

	else

		error = xfs_attr_node_addname(args);

	return error;

}



/*

 * Remove the attribute specified in @args.

 */

int

xfs_attr_remove_args(

	struct xfs_da_args      *args)

{

	struct xfs_inode	*dp = args->dp;

	int			error;



	if (!xfs_inode_hasattr(dp)) {

		error = -ENOATTR;

	} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {

		ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);

		error = xfs_attr_shortform_remove(args);

	} else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {

		error = xfs_attr_leaf_removename(args);

	} else {

		error = xfs_attr_node_removename(args);

	}



	return error;

}



int

xfs_attr_set(

	struct xfs_inode	*dp,
@@ -204,7 +326,7 @@ xfs_attr_set( 
	struct xfs_da_args	args;

	struct xfs_trans_res	tres;

	int			rsvd = (flags & ATTR_ROOT) != 0;

	int			error, err2, local;

	int			error, local;



	XFS_STATS_INC(mp, xs_attr_set);
@@ -255,94 +377,18 @@ xfs_attr_set( 
	error = xfs_trans_reserve_quota_nblks(args.trans, dp, args.total, 0,

				rsvd ? XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES :

				       XFS_QMOPT_RES_REGBLKS);

	if (error) {

		xfs_iunlock(dp, XFS_ILOCK_EXCL);

		xfs_trans_cancel(args.trans);

		return error;

	}



	xfs_trans_ijoin(args.trans, dp, 0);



	/*

	 * If the attribute list is non-existent or a shortform list,

	 * upgrade it to a single-leaf-block attribute list.

	 */

	if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL ||

	    (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS &&

	     dp->i_d.di_anextents == 0)) {



		/*

		 * Build initial attribute list (if required).

		 */

		if (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS)

			xfs_attr_shortform_create(&args);



		/*

		 * Try to add the attr to the attribute list in

		 * the inode.

		 */

		error = xfs_attr_shortform_addname(&args);

		if (error != -ENOSPC) {

			/*

			 * Commit the shortform mods, and we're done.

			 * NOTE: this is also the error path (EEXIST, etc).

			 */

			ASSERT(args.trans != NULL);



			/*

			 * If this is a synchronous mount, make sure that

			 * the transaction goes to disk before returning

			 * to the user.

			 */

			if (mp->m_flags & XFS_MOUNT_WSYNC)

				xfs_trans_set_sync(args.trans);



			if (!error && (flags & ATTR_KERNOTIME) == 0) {

				xfs_trans_ichgtime(args.trans, dp,

							XFS_ICHGTIME_CHG);

			}

			err2 = xfs_trans_commit(args.trans);

			xfs_iunlock(dp, XFS_ILOCK_EXCL);



			return error ? error : err2;

		}



		/*

		 * It won't fit in the shortform, transform to a leaf block.

		 * GROT: another possible req'mt for a double-split btree op.

		 */

		error = xfs_attr_shortform_to_leaf(&args, &leaf_bp);

		if (error)

			goto out;

		/*

		 * Prevent the leaf buffer from being unlocked so that a

		 * concurrent AIL push cannot grab the half-baked leaf

		 * buffer and run into problems with the write verifier.

		 */

		xfs_trans_bhold(args.trans, leaf_bp);

		error = xfs_defer_finish(&args.trans);

	if (error)

			goto out;

		goto out_trans_cancel;



		/*

		 * Commit the leaf transformation.  We'll need another (linked)

		 * transaction to add the new attribute to the leaf, which

		 * means that we have to hold & join the leaf buffer here too.

		 */

		error = xfs_trans_roll_inode(&args.trans, dp);

	xfs_trans_ijoin(args.trans, dp, 0);

	error = xfs_attr_set_args(&args, &leaf_bp);

	if (error)

			goto out;

		xfs_trans_bjoin(args.trans, leaf_bp);

		leaf_bp = NULL;

		goto out_release_leaf;

	if (!args.trans) {

		/* shortform attribute has already been committed */

		goto out_unlock;

	}



	if (xfs_bmap_one_block(dp, XFS_ATTR_FORK))

		error = xfs_attr_leaf_addname(&args);

	else

		error = xfs_attr_node_addname(&args);

	if (error)

		goto out;



	/*

	 * If this is a synchronous mount, make sure that the

	 * transaction goes to disk before returning to the user.
@@ -358,17 +404,17 @@ xfs_attr_set( 
	 */

	xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);

	error = xfs_trans_commit(args.trans);

out_unlock:

	xfs_iunlock(dp, XFS_ILOCK_EXCL);



	return error;



out:

out_release_leaf:

	if (leaf_bp)

		xfs_trans_brelse(args.trans, leaf_bp);

out_trans_cancel:

	if (args.trans)

		xfs_trans_cancel(args.trans);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

	return error;

	goto out_unlock;

}



/*
@@ -423,17 +469,7 @@ xfs_attr_remove( 
	 */

	xfs_trans_ijoin(args.trans, dp, 0);



	if (!xfs_inode_hasattr(dp)) {

		error = -ENOATTR;

	} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {

		ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);

		error = xfs_attr_shortform_remove(&args);

	} else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {

		error = xfs_attr_leaf_removename(&args);

	} else {

		error = xfs_attr_node_removename(&args);

	}



	error = xfs_attr_remove_args(&args);

	if (error)

		goto out;

fs/xfs/xfs_attr.h→fs/xfs/libxfs/xfs_attr.h

+2 −0
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ int xfs_attr_get(struct xfs_inode *ip, const unsigned char *name, 
		 unsigned char *value, int *valuelenp, int flags);

int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name,

		 unsigned char *value, int valuelen, int flags);

int xfs_attr_set_args(struct xfs_da_args *args, struct xfs_buf **leaf_bp);

int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, int flags);

int xfs_attr_remove_args(struct xfs_da_args *args);

int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,

		  int flags, struct attrlist_cursor_kern *cursor);

fs/xfs/libxfs/xfs_bmap.c

+37 −33
Original line number Diff line number Diff line
@@ -1019,6 +1019,34 @@ xfs_bmap_add_attrfork_local( 
	return -EFSCORRUPTED;

}



/* Set an inode attr fork off based on the format */

int

xfs_bmap_set_attrforkoff(

	struct xfs_inode	*ip,

	int			size,

	int			*version)

{

	switch (ip->i_d.di_format) {

	case XFS_DINODE_FMT_DEV:

		ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;

		break;

	case XFS_DINODE_FMT_LOCAL:

	case XFS_DINODE_FMT_EXTENTS:

	case XFS_DINODE_FMT_BTREE:

		ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size);

		if (!ip->i_d.di_forkoff)

			ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3;

		else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version)

			*version = 2;

		break;

	default:

		ASSERT(0);

		return -EINVAL;

	}



	return 0;

}



/*

 * Convert inode from non-attributed to attributed.

 * Must not be in a transaction, ip must not be locked.
@@ -1070,26 +1098,9 @@ xfs_bmap_add_attrfork( 


	xfs_trans_ijoin(tp, ip, 0);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	switch (ip->i_d.di_format) {

	case XFS_DINODE_FMT_DEV:

		ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;

		break;

	case XFS_DINODE_FMT_LOCAL:

	case XFS_DINODE_FMT_EXTENTS:

	case XFS_DINODE_FMT_BTREE:

		ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size);

		if (!ip->i_d.di_forkoff)

			ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3;

		else if (mp->m_flags & XFS_MOUNT_ATTR2)

			version = 2;

		break;

	default:

		ASSERT(0);

		error = -EINVAL;

	error = xfs_bmap_set_attrforkoff(ip, size, &version);

	if (error)

		goto trans_cancel;

	}



	ASSERT(ip->i_afp == NULL);

	ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, KM_SLEEP);

	ip->i_afp->if_flags = XFS_IFEXTENTS;
@@ -4081,8 +4092,7 @@ xfs_bmapi_allocate( 
	 * extents to real extents when we're about to write the data.

	 */

	if ((!bma->wasdel || (bma->flags & XFS_BMAPI_COWFORK)) &&

	    (bma->flags & XFS_BMAPI_PREALLOC) &&

	    xfs_sb_version_hasextflgbit(&mp->m_sb))

	    (bma->flags & XFS_BMAPI_PREALLOC))

		bma->got.br_state = XFS_EXT_UNWRITTEN;



	if (bma->wasdel)
@@ -5245,8 +5255,7 @@ __xfs_bunmapi( 
			 * unmapping part of it.  But we can't really

			 * get rid of part of a realtime extent.

			 */

			if (del.br_state == XFS_EXT_UNWRITTEN ||

			    !xfs_sb_version_hasextflgbit(&mp->m_sb)) {

			if (del.br_state == XFS_EXT_UNWRITTEN) {

				/*

				 * This piece is unwritten, or we're not

				 * using unwritten extents.  Skip over it.
@@ -5296,10 +5305,9 @@ __xfs_bunmapi( 
				del.br_blockcount -= mod;

				del.br_startoff += mod;

				del.br_startblock += mod;

			} else if ((del.br_startoff == start &&

			} else if (del.br_startoff == start &&

				   (del.br_state == XFS_EXT_UNWRITTEN ||

				     tp->t_blk_res == 0)) ||

				   !xfs_sb_version_hasextflgbit(&mp->m_sb)) {

				    tp->t_blk_res == 0)) {

				/*

				 * Can't make it unwritten.  There isn't

				 * a full extent here so just skip it.
@@ -6114,11 +6122,7 @@ xfs_bmap_validate_extent( 
		    XFS_FSB_TO_AGNO(mp, endfsb))

			return __this_address;

	}

	if (irec->br_state != XFS_EXT_NORM) {

		if (whichfork != XFS_DATA_FORK)

	if (irec->br_state != XFS_EXT_NORM && whichfork != XFS_DATA_FORK)

		return __this_address;

		if (!xfs_sb_version_hasextflgbit(&mp->m_sb))

			return __this_address;

	}

	return NULL;

}

fs/xfs/libxfs/xfs_bmap.h

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

void	xfs_trim_extent_eof(struct xfs_bmbt_irec *, struct xfs_inode *);

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_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,

		xfs_filblks_t len, struct xfs_owner_info *oinfo,

fs/xfs/libxfs/xfs_format.h

+2 −6
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ static inline bool xfs_sb_good_v4_features(struct xfs_sb *sbp) 
{

	if (!(sbp->sb_versionnum & XFS_SB_VERSION_DIRV2BIT))

		return false;

	if (!(sbp->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT))

		return false;



	/* check for unknown features in the fs */

	if ((sbp->sb_versionnum & ~XFS_SB_VERSION_OKBITS) ||
@@ -357,12 +359,6 @@ static inline bool xfs_sb_version_haslogv2(struct xfs_sb *sbp) 
	       (sbp->sb_versionnum & XFS_SB_VERSION_LOGV2BIT);

}



static inline bool xfs_sb_version_hasextflgbit(struct xfs_sb *sbp)

{

	return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 ||

	       (sbp->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT);

}



static inline bool xfs_sb_version_hassector(struct xfs_sb *sbp)

{

	return (sbp->sb_versionnum & XFS_SB_VERSION_SECTORBIT);