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

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

Pull xfs update from Dave Chinner:
 "This update contains:

   - RENAME_EXCHANGE support

   - Rework of the superblock logging infrastructure

   - Rework of the XFS_IOCTL_SETXATTR implementation
       * enables use inside user namespaces
       * fixes inconsistencies setting extent size hints

   - fixes for missing buffer type annotations used in log recovery

   - more consolidation of libxfs headers

   - preparation patches for block based PNFS support

   - miscellaneous bug fixes and cleanups"

* tag 'xfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (37 commits)
  xfs: only trace buffer items if they exist
  xfs: report proper f_files in statfs if we overshoot imaxpct
  xfs: fix panic_mask documentation
  xfs: xfs_ioctl_setattr_check_projid can be static
  xfs: growfs should use synchronous transactions
  xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories
  xfs: factor projid hint checking out of xfs_ioctl_setattr
  xfs: factor extsize hint checking out of xfs_ioctl_setattr
  xfs: XFS_IOCTL_SETXATTR can run in user namespaces
  xfs: kill xfs_ioctl_setattr behaviour mask
  xfs: disaggregate xfs_ioctl_setattr
  xfs: factor out xfs_ioctl_setattr transaciton preamble
  xfs: separate xflags from xfs_ioctl_setattr
  xfs: FSX_NONBLOCK is not used
  xfs: don't allocate an ioend for direct I/O completions
  xfs: change kmem_free to use generic kvfree()
  xfs: factor out a xfs_update_prealloc_flags() helper
  xfs: remove incorrect error negation in attr_multi ioctl
  xfs: set superblock buffer type correctly
  xfs: set buf types when converting extent formats
  ...
parents c5452a58 bad96266

Documentation/filesystems/xfs.txt

+10 −12
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ The following sysctls are available for the XFS filesystem: 
		XFS_ERRLEVEL_LOW:       1

		XFS_ERRLEVEL_HIGH:      5



  fs.xfs.panic_mask		(Min: 0  Default: 0  Max: 127)

  fs.xfs.panic_mask		(Min: 0  Default: 0  Max: 255)

	Causes certain error conditions to call BUG(). Value is a bitmask;

	AND together the tags which represent errors which should cause panics:

	OR together the tags which represent errors which should cause panics:



		XFS_NO_PTAG                     0

		XFS_PTAG_IFLUSH                 0x00000001
@@ -299,6 +299,7 @@ The following sysctls are available for the XFS filesystem: 
		XFS_PTAG_SHUTDOWN_CORRUPT       0x00000010

		XFS_PTAG_SHUTDOWN_IOERROR       0x00000020

		XFS_PTAG_SHUTDOWN_LOGERROR      0x00000040

		XFS_PTAG_FSBLOCK_ZERO           0x00000080



	This option is intended for debugging only.
@@ -348,16 +349,13 @@ The following sysctls are available for the XFS filesystem: 
Deprecated Sysctls

==================



  fs.xfs.xfsbufd_centisecs	(Min: 50  Default: 100	Max: 3000)

	Dirty metadata is now tracked by the log subsystem and

	flushing is driven by log space and idling demands. The

	xfsbufd no longer exists, so this syctl does nothing.

None at present.



	Due for removal in 3.14.



  fs.xfs.age_buffer_centisecs	(Min: 100  Default: 1500  Max: 720000)

	Dirty metadata is now tracked by the log subsystem and

	flushing is driven by log space and idling demands. The

	xfsbufd no longer exists, so this syctl does nothing.

Removed Sysctls

===============



	Due for removal in 3.14.
 
  Name				Removed

  ----				-------

  fs.xfs.xfsbufd_centisec	v3.20

  fs.xfs.age_buffer_centisecs	v3.20

fs/xfs/kmem.c

+0 −10
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags) 
	return ptr;

}



void

kmem_free(const void *ptr)

{

	if (!is_vmalloc_addr(ptr)) {

		kfree(ptr);

	} else {

		vfree(ptr);

	}

}



void *

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

	     xfs_km_flags_t flags)

fs/xfs/kmem.h

+4 −1
Original line number Diff line number Diff line
@@ -63,7 +63,10 @@ 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_free(const void *);

static inline void  kmem_free(const void *ptr)

{

	kvfree(ptr);

}





extern void *kmem_zalloc_greedy(size_t *, size_t, size_t);

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp) 
		if (!xfs_sb_version_hasattr2(&mp->m_sb)) {

			xfs_sb_version_addattr2(&mp->m_sb);

			spin_unlock(&mp->m_sb_lock);

			xfs_mod_sb(tp, XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);

			xfs_log_sb(tp);

		} else

			spin_unlock(&mp->m_sb_lock);

	}

fs/xfs/libxfs/xfs_bmap.c

+11 −9
Original line number Diff line number Diff line
@@ -973,7 +973,11 @@ xfs_bmap_local_to_extents( 
	*firstblock = args.fsbno;

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);



	/* initialise the block and copy the data */

	/*

	 * Initialise the block and copy the data

	 *

	 * Note: init_fn must set the buffer log item type correctly!

	 */

	init_fn(tp, bp, ip, ifp);



	/* account for the change in fork size and log everything */
@@ -1221,22 +1225,20 @@ xfs_bmap_add_attrfork( 
		goto bmap_cancel;

	if (!xfs_sb_version_hasattr(&mp->m_sb) ||

	   (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2)) {

		__int64_t sbfields = 0;

		bool log_sb = false;



		spin_lock(&mp->m_sb_lock);

		if (!xfs_sb_version_hasattr(&mp->m_sb)) {

			xfs_sb_version_addattr(&mp->m_sb);

			sbfields |= XFS_SB_VERSIONNUM;

			log_sb = true;

		}

		if (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2) {

			xfs_sb_version_addattr2(&mp->m_sb);

			sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);

			log_sb = true;

		}

		if (sbfields) {

			spin_unlock(&mp->m_sb_lock);

			xfs_mod_sb(tp, sbfields);

		} else

		spin_unlock(&mp->m_sb_lock);

		if (log_sb)

			xfs_log_sb(tp);

	}



	error = xfs_bmap_finish(&tp, &flist, &committed);

CRA Git | Maintained and supported by SUSTech CRA and CCSE