Commit 0b9210c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs 

Pull xfs updates from Dave Chinner:
 "A pretty average collection of fixes, cleanups and improvements in
  this request.

  Summary:
   - fixes for mount line parsing, sparse warnings, read-only compat
     feature remount behaviour
   - allow fast path symlink lookups for inline symlinks.
   - attribute listing cleanups
   - writeback goes direct to bios rather than indirecting through
     bufferheads
   - transaction allocation cleanup
   - optimised kmem_realloc
   - added configurable error handling for metadata write errors,
     changed default error handling behaviour from "retry forever" to
     "retry until unmount then fail"
   - fixed several inode cluster writeback lookup vs reclaim race
     conditions
   - fixed inode cluster writeback checking wrong inode after lookup
   - fixed bugs where struct xfs_inode freeing wasn't actually RCU safe
   - cleaned up inode reclaim tagging"

* tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (39 commits)
  xfs: fix warning in xfs_finish_page_writeback for non-debug builds
  xfs: move reclaim tagging functions
  xfs: simplify inode reclaim tagging interfaces
  xfs: rename variables in xfs_iflush_cluster for clarity
  xfs: xfs_iflush_cluster has range issues
  xfs: mark reclaimed inodes invalid earlier
  xfs: xfs_inode_free() isn't RCU safe
  xfs: optimise xfs_iext_destroy
  xfs: skip stale inodes in xfs_iflush_cluster
  xfs: fix inode validity check in xfs_iflush_cluster
  xfs: xfs_iflush_cluster fails to abort on error
  xfs: remove xfs_fs_evict_inode()
  xfs: add "fail at unmount" error handling configuration
  xfs: add configuration handlers for specific errors
  xfs: add configuration of error failure speed
  xfs: introduce table-based init for error behaviors
  xfs: add configurable error support to metadata buffers
  xfs: introduce metadata IO error class
  xfs: configurable error behavior via sysfs
  xfs: buffer ->bi_end_io function requires irq-safe lock
  ...
parents c5436731 555b67e4

fs/namei.c

+0 −1
Original line number Diff line number Diff line
@@ -4542,7 +4542,6 @@ int readlink_copy(char __user *buffer, int buflen, const char *link) 
out:

	return len;

}

EXPORT_SYMBOL(readlink_copy);



/*

 * A helper for ->readlink().  This should be used *ONLY* for symlinks that

fs/xfs/kmem.c

+15 −11
Original line number Diff line number Diff line
@@ -93,19 +93,23 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags) 
}



void *

kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,

	     xfs_km_flags_t flags)

kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags)

{

	void	*new;

	int	retries = 0;

	gfp_t	lflags = kmem_flags_convert(flags);

	void	*ptr;



	new = kmem_alloc(newsize, flags);

	if (ptr) {

		if (new)

			memcpy(new, ptr,

				((oldsize < newsize) ? oldsize : newsize));

		kmem_free(ptr);

	}

	return new;

	do {

		ptr = krealloc(old, newsize, lflags);

		if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))

			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,

	"%s(%u) possible memory allocation deadlock size %zu in %s (mode:0x%x)",

				current->comm, current->pid,

				newsize, __func__, lflags);

		congestion_wait(BLK_RW_ASYNC, HZ/50);

	} while (1);

}



void *

fs/xfs/kmem.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ kmem_flags_convert(xfs_km_flags_t flags) 


extern void *kmem_alloc(size_t, xfs_km_flags_t);

extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t);

extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t);

extern void *kmem_realloc(const void *, size_t, xfs_km_flags_t);

static inline void  kmem_free(const void *ptr)

{

	kvfree(ptr);

fs/xfs/libxfs/xfs_attr.c

+13 −45
Original line number Diff line number Diff line
@@ -242,37 +242,21 @@ xfs_attr_set( 
			return error;

	}



	/*

	 * Start our first transaction of the day.

	 *

	 * All future transactions during this code must be "chained" off

	 * this one via the trans_dup() call.  All transactions will contain

	 * the inode, and the inode will always be marked with trans_ihold().

	 * Since the inode will be locked in all transactions, we must log

	 * the inode in every transaction to let it float upward through

	 * the log.

	 */

	args.trans = xfs_trans_alloc(mp, XFS_TRANS_ATTR_SET);

	tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +

			 M_RES(mp)->tr_attrsetrt.tr_logres * args.total;

	tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;

	tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;



	/*

	 * Root fork attributes can use reserved data blocks for this

	 * operation if necessary

	 */



	if (rsvd)

		args.trans->t_flags |= XFS_TRANS_RESERVE;



	tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +

			 M_RES(mp)->tr_attrsetrt.tr_logres * args.total;

	tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;

	tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;

	error = xfs_trans_reserve(args.trans, &tres, args.total, 0);

	if (error) {

		xfs_trans_cancel(args.trans);

	error = xfs_trans_alloc(mp, &tres, args.total, 0,

			rsvd ? XFS_TRANS_RESERVE : 0, &args.trans);

	if (error)

		return error;

	}

	xfs_ilock(dp, XFS_ILOCK_EXCL);



	xfs_ilock(dp, XFS_ILOCK_EXCL);

	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);
@@ -428,32 +412,16 @@ xfs_attr_remove( 
	if (error)

		return error;



	/*

	 * Start our first transaction of the day.

	 *

	 * All future transactions during this code must be "chained" off

	 * this one via the trans_dup() call.  All transactions will contain

	 * the inode, and the inode will always be marked with trans_ihold().

	 * Since the inode will be locked in all transactions, we must log

	 * the inode in every transaction to let it float upward through

	 * the log.

	 */

	args.trans = xfs_trans_alloc(mp, XFS_TRANS_ATTR_RM);



	/*

	 * Root fork attributes can use reserved data blocks for this

	 * operation if necessary

	 */



	if (flags & ATTR_ROOT)

		args.trans->t_flags |= XFS_TRANS_RESERVE;



	error = xfs_trans_reserve(args.trans, &M_RES(mp)->tr_attrrm,

				  XFS_ATTRRM_SPACE_RES(mp), 0);

	if (error) {

		xfs_trans_cancel(args.trans);

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_attrrm,

			XFS_ATTRRM_SPACE_RES(mp), 0,

			(flags & ATTR_ROOT) ? XFS_TRANS_RESERVE : 0,

			&args.trans);

	if (error)

		return error;

	}



	xfs_ilock(dp, XFS_ILOCK_EXCL);

	/*

fs/xfs/libxfs/xfs_bmap.c

+9 −13
Original line number Diff line number Diff line
@@ -1121,15 +1121,14 @@ xfs_bmap_add_attrfork( 


	mp = ip->i_mount;

	ASSERT(!XFS_NOT_DQATTACHED(mp, ip));

	tp = xfs_trans_alloc(mp, XFS_TRANS_ADDAFORK);



	blks = XFS_ADDAFORK_SPACE_RES(mp);

	if (rsvd)

		tp->t_flags |= XFS_TRANS_RESERVE;

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_addafork, blks, 0);

	if (error) {

		xfs_trans_cancel(tp);



	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_addafork, blks, 0,

			rsvd ? XFS_TRANS_RESERVE : 0, &tp);

	if (error)

		return error;

	}



	xfs_ilock(ip, XFS_ILOCK_EXCL);

	error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd ?

			XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES :
@@ -6026,13 +6025,10 @@ xfs_bmap_split_extent( 
	xfs_fsblock_t           firstfsb;

	int                     error;



	tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,

			XFS_DIOSTRAT_SPACE_RES(mp, 0), 0);

	if (error) {

		xfs_trans_cancel(tp);

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write,

			XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp);

	if (error)

		return error;

	}



	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE