Commit 1d32bdaf authored Jan 23, 2014 by Linus Torvalds

Merge tag 'xfs-for-linus-v3.14-rc1' of git://oss.sgi.com/xfs/xfs

Pull xfs update from Ben Myers:
 "This is primarily bug fixes, many of which you already have.  New
  stuff includes a series to decouple the in-memory and on-disk log
  format, helpers in the area of inode clusters, and i_version handling.

  We decided to try to use more topic branches this release, so there
  are some merge commits in there on account of that.  I'm afraid I
  didn't do a good job of putting meaningful comments in the first
  couple of merges.  Sorry about that.  I think I have the hang of it
  now.

  For 3.14-rc1 there are fixes in the areas of remote attributes,
  discard, growfs, memory leaks in recovery, directory v2, quotas, the
  MAINTAINERS file, allocation alignment, extent list locking, and in
  xfs_bmapi_allocate.  There are cleanups in xfs_setsize_buftarg,
  removing unused macros, quotas, setattr, and freeing of inode
  clusters.  The in-memory and on-disk log format have been decoupled, a
  common helper to calculate the number of blocks in an inode cluster
  has been added, and handling of i_version has been pulled into the
  filesystems that use it.

   - cleanup in xfs_setsize_buftarg
   - removal of remaining unused flags for vop toss/flush/flushinval
   - fix for memory corruption in xfs_attrlist_by_handle
   - fix for out-of-date comment in xfs_trans_dqlockedjoin
   - fix for discard if range length is less than one block
   - fix for overrun of agfl buffer using growfs on v4 superblock
     filesystems
   - pull i_version handling out into the filesystems that use it
   - don't leak recovery items on error
   - fix for memory leak in xfs_dir2_node_removename
   - several cleanups for quotas
   - fix bad assertion in xfs_qm_vop_create_dqattach
   - cleanup for xfs_setattr_mode, and add xfs_setattr_time
   - fix quota assert in xfs_setattr_nonsize
   - fix an infinite loop when turning off group/project quota before
     user quota
   - fix for temporary buffer allocation failure in xfs_dir2_block_to_sf
     with large directory block sizes
   - fix Dave's email address in MAINTAINERS
   - cleanup calculation of freed inode cluster blocks
   - fix alignment of initial file allocations to match filesystem
     geometry
   - decouple in-memory and on-disk log format
   - introduce a common helper to calculate the number of filesystem
     blocks in an inode cluster
   - fixes for extent list locking
   - fix for off-by-one in xfs_attr3_rmt_verify
   - fix for missing destroy_work_on_stack in xfs_bmapi_allocate"

* tag 'xfs-for-linus-v3.14-rc1' of git://oss.sgi.com/xfs/xfs: (51 commits)
  xfs: Calling destroy_work_on_stack() to pair with INIT_WORK_ONSTACK()
  xfs: fix off-by-one error in xfs_attr3_rmt_verify
  xfs: assert that we hold the ilock for extent map access
  xfs: use xfs_ilock_attr_map_shared in xfs_attr_list_int
  xfs: use xfs_ilock_attr_map_shared in xfs_attr_get
  xfs: use xfs_ilock_data_map_shared in xfs_qm_dqiterate
  xfs: use xfs_ilock_data_map_shared in xfs_qm_dqtobp
  xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes
  xfs: reinstate the ilock in xfs_readdir
  xfs: add xfs_ilock_attr_map_shared
  xfs: rename xfs_ilock_map_shared
  xfs: remove xfs_iunlock_map_shared
  xfs: no need to lock the inode in xfs_find_handle
  xfs: use xfs_icluster_size_fsb in xfs_imap
  xfs: use xfs_icluster_size_fsb in xfs_ifree_cluster
  xfs: use xfs_icluster_size_fsb in xfs_ialloc_inode_init
  xfs: use xfs_icluster_size_fsb in xfs_bulkstat
  xfs: introduce a common helper xfs_icluster_size_fsb
  xfs: get rid of XFS_IALLOC_BLOCKS macros
  xfs: get rid of XFS_INODE_CLUSTER_SIZE macros
  ...

parents 0dc3fd02 bf3964c1

fs/attr.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -202,11 +202,6 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de
		return -EPERM;
		}

		if ((ia_valid & ATTR_SIZE) && IS_I_VERSION(inode)) {
		if (attr->ia_size != inode->i_size)
		inode_inc_iversion(inode);
		}

		if ((ia_valid & ATTR_MODE)) {
		umode_t amode = attr->ia_mode;
		/* Flag setting protected by i_mutex */

fs/btrfs/inode.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -4354,8 +4354,12 @@ static int btrfs_setsize(struct inode inode, struct iattr attr)
		* these flags set. For all other operations the VFS set these flags
		* explicitly if it wants a timestamp update.
		*/
		if (newsize != oldsize && (!(mask & (ATTR_CTIME \| ATTR_MTIME))))
		inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
		if (newsize != oldsize) {
		inode_inc_iversion(inode);
		if (!(mask & (ATTR_CTIME \| ATTR_MTIME)))
		inode->i_ctime = inode->i_mtime =
		current_fs_time(inode->i_sb);
		}

		if (newsize > oldsize) {
		truncate_pagecache(inode, newsize);

fs/ext4/inode.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4586,6 +4586,10 @@ int ext4_setattr(struct dentry dentry, struct iattr attr)
		if (attr->ia_size > sbi->s_bitmap_maxbytes)
		return -EFBIG;
		}

		if (IS_I_VERSION(inode) && attr->ia_size != inode->i_size)
		inode_inc_iversion(inode);

		if (S_ISREG(inode->i_mode) &&
		(attr->ia_size < inode->i_size)) {
		if (ext4_should_order_data(inode)) {

fs/xfs/xfs_aops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1217,7 +1217,7 @@ __xfs_get_blocks(
		lockmode = XFS_ILOCK_EXCL;
		xfs_ilock(ip, lockmode);
		} else {
		lockmode = xfs_ilock_map_shared(ip);
		lockmode = xfs_ilock_data_map_shared(ip);
		}

		ASSERT(offset <= mp->m_super->s_maxbytes);

fs/xfs/xfs_attr.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@ xfs_attr_get(
		{
		int error;
		struct xfs_name xname;
		uint lock_mode;

		XFS_STATS_INC(xs_attr_get);

		@@ -174,9 +175,9 @@ xfs_attr_get(
		if (error)
		return error;

		xfs_ilock(ip, XFS_ILOCK_SHARED);
		lock_mode = xfs_ilock_attr_map_shared(ip);
		error = xfs_attr_get_int(ip, &xname, value, valuelenp, flags);
		xfs_iunlock(ip, XFS_ILOCK_SHARED);
		xfs_iunlock(ip, lock_mode);
		return(error);
		}