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

Commit 5d50ac70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs updates from Dave Chinner:
 "There is nothing really major here - the only significant addition is
  the per-mount operation statistics infrastructure.  Otherwises there's
  various ACL, xattr, DAX, AIO and logging fixes, and a smattering of
  small cleanups and fixes elsewhere.

  Summary:

   - per-mount operational statistics in sysfs
   - fixes for concurrent aio append write submission
   - various logging fixes
   - detection of zeroed logs and invalid log sequence numbers on v5 filesystems
   - memory allocation failure message improvements
   - a bunch of xattr/ACL fixes
   - fdatasync optimisation
   - miscellaneous other fixes and cleanups"

* tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (39 commits)
  xfs: give all workqueues rescuer threads
  xfs: fix log recovery op header validation assert
  xfs: Fix error path in xfs_get_acl
  xfs: optimise away log forces on timestamp updates for fdatasync
  xfs: don't leak uuid table on rmmod
  xfs: invalidate cached acl if set via ioctl
  xfs: Plug memory leak in xfs_attrmulti_attr_set
  xfs: Validate the length of on-disk ACLs
  xfs: invalidate cached acl if set directly via xattr
  xfs: xfs_filemap_pmd_fault treats read faults as write faults
  xfs: add ->pfn_mkwrite support for DAX
  xfs: DAX does not use IO completion callbacks
  xfs: Don't use unwritten extents for DAX
  xfs: introduce BMAPI_ZERO for allocating zeroed extents
  xfs: fix inode size update overflow in xfs_map_direct()
  xfs: clear PF_NOFREEZE for xfsaild kthread
  xfs: fix an error code in xfs_fs_fill_super()
  xfs: stats are no longer dependent on CONFIG_PROC_FS
  xfs: simplify /proc teardown & error handling
  xfs: per-filesystem stats counter implementation
  ...
parents 31c1febd 4e14e49a

fs/dax.c

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ 
#include <linux/uio.h>

#include <linux/vmstat.h>



/*

 * dax_clear_blocks() is called from within transaction context from XFS,

 * and hence this means the stack from this point must follow GFP_NOFS

 * semantics for all operations.

 */

int dax_clear_blocks(struct inode *inode, sector_t block, long size)

{

	struct block_device *bdev = inode->i_sb->s_bdev;

fs/xfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ xfs-y += xfs_aops.o \ 
				   xfs_message.o \

				   xfs_mount.o \

				   xfs_mru_cache.o \

				   xfs_stats.o \

				   xfs_super.o \

				   xfs_symlink.o \

				   xfs_sysfs.o \
@@ -118,7 +119,6 @@ xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \ 
xfs-$(CONFIG_XFS_RT)		+= xfs_rtalloc.o



xfs-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o

xfs-$(CONFIG_PROC_FS)		+= xfs_stats.o

xfs-$(CONFIG_SYSCTL)		+= xfs_sysctl.o

xfs-$(CONFIG_COMPAT)		+= xfs_ioctl32.o

xfs-$(CONFIG_NFSD_PNFS)		+= xfs_pnfs.o

fs/xfs/kmem.c

+6 −4
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ kmem_alloc(size_t size, xfs_km_flags_t flags) 
			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,

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

					__func__, lflags);

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

				current->comm, current->pid,

				(unsigned int)size, __func__, lflags);

		congestion_wait(BLK_RW_ASYNC, HZ/50);

	} while (1);

}
@@ -120,7 +121,8 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags) 
			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,

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

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

				current->comm, current->pid,

				__func__, lflags);

		congestion_wait(BLK_RW_ASYNC, HZ/50);

	} while (1);

fs/xfs/libxfs/xfs_alloc.c

+22 −8
Original line number Diff line number Diff line
@@ -482,7 +482,9 @@ xfs_agfl_verify( 
		    be32_to_cpu(agfl->agfl_bno[i]) >= mp->m_sb.sb_agblocks)

			return false;

	}

	return true;



	return xfs_log_check_lsn(mp,

				 be64_to_cpu(XFS_BUF_TO_AGFL(bp)->agfl_lsn));

}



static void
@@ -651,8 +653,8 @@ xfs_alloc_ag_vextent( 
				 -((long)(args->len)));

	}



	XFS_STATS_INC(xs_allocx);

	XFS_STATS_ADD(xs_allocb, args->len);

	XFS_STATS_INC(args->mp, xs_allocx);

	XFS_STATS_ADD(args->mp, xs_allocb, args->len);

	return error;

}
@@ -1808,8 +1810,8 @@ xfs_free_ag_extent( 


	if (!isfl)

		xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (long)len);

	XFS_STATS_INC(xs_freex);

	XFS_STATS_ADD(xs_freeb, len);

	XFS_STATS_INC(mp, xs_freex);

	XFS_STATS_ADD(mp, xs_freeb, len);



	trace_xfs_free_extent(mp, agno, bno, len, isfl, haveleft, haveright);
@@ -2259,9 +2261,13 @@ xfs_agf_verify( 
 {

	struct xfs_agf	*agf = XFS_BUF_TO_AGF(bp);



	if (xfs_sb_version_hascrc(&mp->m_sb) &&

	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

	if (xfs_sb_version_hascrc(&mp->m_sb)) {

		if (!uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (!xfs_log_check_lsn(mp,

				be64_to_cpu(XFS_BUF_TO_AGF(bp)->agf_lsn)))

			return false;

	}



	if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&

	      XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&
@@ -2503,7 +2509,7 @@ xfs_alloc_vextent( 
		 * Try near allocation first, then anywhere-in-ag after

		 * the first a.g. fails.

		 */

		if ((args->userdata  == XFS_ALLOC_INITIAL_USER_DATA) &&

		if ((args->userdata & XFS_ALLOC_INITIAL_USER_DATA) &&

		    (mp->m_flags & XFS_MOUNT_32BITINODES)) {

			args->fsbno = XFS_AGB_TO_FSB(mp,

					((mp->m_agfrotor / rotorstep) %
@@ -2634,6 +2640,14 @@ xfs_alloc_vextent( 
		XFS_AG_CHECK_DADDR(mp, XFS_FSB_TO_DADDR(mp, args->fsbno),

			args->len);

#endif



		/* Zero the extent if we were asked to do so */

		if (args->userdata & XFS_ALLOC_USERDATA_ZERO) {

			error = xfs_zero_extent(args->ip, args->fsbno, args->len);

			if (error)

				goto error0;

		}



	}

	xfs_perag_put(args->pag);

	return 0;

fs/xfs/libxfs/xfs_alloc.h

+5 −3
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ typedef struct xfs_alloc_arg { 
	struct xfs_mount *mp;		/* file system mount point */

	struct xfs_buf	*agbp;		/* buffer for a.g. freelist header */

	struct xfs_perag *pag;		/* per-ag struct for this agno */

	struct xfs_inode *ip;		/* for userdata zeroing method */

	xfs_fsblock_t	fsbno;		/* file system block number */

	xfs_agnumber_t	agno;		/* allocation group number */

	xfs_agblock_t	agbno;		/* allocation group-relative block # */
@@ -120,15 +121,16 @@ typedef struct xfs_alloc_arg { 
	char		wasdel;		/* set if allocation was prev delayed */

	char		wasfromfl;	/* set if allocation is from freelist */

	char		isfl;		/* set if is freelist blocks - !acctg */

	char		userdata;	/* set if this is user data */

	char		userdata;	/* mask defining userdata treatment */

	xfs_fsblock_t	firstblock;	/* io first block allocated */

} xfs_alloc_arg_t;



/*

 * Defines for userdata

 */

#define XFS_ALLOC_USERDATA		1	/* allocation is for user data*/

#define XFS_ALLOC_INITIAL_USER_DATA	2	/* special case start of file */

#define XFS_ALLOC_USERDATA		(1 << 0)/* allocation is for user data*/

#define XFS_ALLOC_INITIAL_USER_DATA	(1 << 1)/* special case start of file */

#define XFS_ALLOC_USERDATA_ZERO		(1 << 2)/* zero extent on allocation */



xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_mount *mp,

		struct xfs_perag *pag, xfs_extlen_t need);