Commit 53d2e697 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs updates from Dave Chinner:
 "There's quite a lot in this request, and there's some cross-over with
  ext4, dax and quota code due to the nature of the changes being made.

  As for the rest of the XFS changes, there are lots of little things
  all over the place, which add up to a lot of changes in the end.

  The major changes are that we've reduced the size of the struct
  xfs_inode by ~100 bytes (gives an inode cache footprint reduction of
  >10%), the writepage code now only does a single set of mapping tree
  lockups so uses less CPU, delayed allocation reservations won't
  overrun under random write loads anymore, and we added compile time
  verification for on-disk structure sizes so we find out when a commit
  or platform/compiler change breaks the on disk structure as early as
  possible.

  Change summary:

   - error propagation for direct IO failures fixes for both XFS and
     ext4
   - new quota interfaces and XFS implementation for iterating all the
     quota IDs in the filesystem
   - locking fixes for real-time device extent allocation
   - reduction of duplicate information in the xfs and vfs inode, saving
     roughly 100 bytes of memory per cached inode.
   - buffer flag cleanup
   - rework of the writepage code to use the generic write clustering
     mechanisms
   - several fixes for inode flag based DAX enablement
   - rework of remount option parsing
   - compile time verification of on-disk format structure sizes
   - delayed allocation reservation overrun fixes
   - lots of little error handling fixes
   - small memory leak fixes
   - enable xfsaild freezing again"

* tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (66 commits)
  xfs: always set rvalp in xfs_dir2_node_trim_free
  xfs: ensure committed is initialized in xfs_trans_roll
  xfs: borrow indirect blocks from freed extent when available
  xfs: refactor delalloc indlen reservation split into helper
  xfs: update freeblocks counter after extent deletion
  xfs: debug mode forced buffered write failure
  xfs: remove impossible condition
  xfs: check sizes of XFS on-disk structures at compile time
  xfs: ioends require logically contiguous file offsets
  xfs: use named array initializers for log item dumping
  xfs: fix computation of inode btree maxlevels
  xfs: reinitialise per-AG structures if geometry changes during recovery
  xfs: remove xfs_trans_get_block_res
  xfs: fix up inode32/64 (re)mount handling
  xfs: fix format specifier , should be %llx and not %llu
  xfs: sanitize remount options
  xfs: convert mount option parsing to tokens
  xfs: fix two memory leaks in xfs_attr_list.c error paths
  xfs: XFS_DIFLAG2_DAX limited by PAGE_SIZE
  xfs: dynamically switch modes when XFS_DIFLAG2_DAX is set/cleared
  ...
parents d407574e 2cdb958a

fs/dax.c

+7 −2
Original line number Diff line number Diff line
@@ -286,8 +286,13 @@ ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode, 
	if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)

		inode_unlock(inode);



	if ((retval > 0) && end_io)

		end_io(iocb, pos, retval, bh.b_private);

	if (end_io) {

		int err;



		err = end_io(iocb, pos, retval, bh.b_private);

		if (err)

			retval = err;

	}



	if (!(flags & DIO_SKIP_DIO_COUNT))

		inode_dio_end(inode);

fs/direct-io.c

+7 −2
Original line number Diff line number Diff line
@@ -253,8 +253,13 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, 
	if (ret == 0)

		ret = transferred;



	if (dio->end_io && dio->result)

		dio->end_io(dio->iocb, offset, transferred, dio->private);

	if (dio->end_io) {

		int err;



		err = dio->end_io(dio->iocb, offset, ret, dio->private);

		if (err)

			ret = err;

	}



	if (!(dio->flags & DIO_SKIP_DIO_COUNT))

		inode_dio_end(dio->inode);

fs/ext4/ext4.h

+21 −9
Original line number Diff line number Diff line
@@ -1511,15 +1511,6 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) 
		 ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));

}



static inline void ext4_set_io_unwritten_flag(struct inode *inode,

					      struct ext4_io_end *io_end)

{

	if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {

		io_end->flag |= EXT4_IO_END_UNWRITTEN;

		atomic_inc(&EXT4_I(inode)->i_unwritten);

	}

}



/*

 * Inode dynamic state flags

 */
@@ -3293,6 +3284,27 @@ extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ]; 
extern int ext4_resize_begin(struct super_block *sb);

extern void ext4_resize_end(struct super_block *sb);



static inline void ext4_set_io_unwritten_flag(struct inode *inode,

					      struct ext4_io_end *io_end)

{

	if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {

		io_end->flag |= EXT4_IO_END_UNWRITTEN;

		atomic_inc(&EXT4_I(inode)->i_unwritten);

	}

}



static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)

{

	struct inode *inode = io_end->inode;



	if (io_end->flag & EXT4_IO_END_UNWRITTEN) {

		io_end->flag &= ~EXT4_IO_END_UNWRITTEN;

		/* Wake up anyone waiting on unwritten extent conversion */

		if (atomic_dec_and_test(&EXT4_I(inode)->i_unwritten))

			wake_up_all(ext4_ioend_wq(inode));

	}

}



#endif	/* __KERNEL__ */



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

fs/ext4/inode.c

+12 −2
Original line number Diff line number Diff line
@@ -3289,22 +3289,32 @@ out: 
}

#endif



static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,

static int ext4_end_io_dio(struct kiocb *iocb, loff_t offset,

			    ssize_t size, void *private)

{

        ext4_io_end_t *io_end = private;



	/* if not async direct IO just return */

	if (!io_end)

		return;

		return 0;



	ext_debug("ext4_end_io_dio(): io_end 0x%p "

		  "for inode %lu, iocb 0x%p, offset %llu, size %zd\n",

		  io_end, io_end->inode->i_ino, iocb, offset, size);



	/*

	 * Error during AIO DIO. We cannot convert unwritten extents as the

	 * data was not written. Just clear the unwritten flag and drop io_end.

	 */

	if (size <= 0) {

		ext4_clear_io_unwritten_flag(io_end);

		size = 0;

	}

	io_end->offset = offset;

	io_end->size = size;

	ext4_put_io_end(io_end);



	return 0;

}



/*

fs/ext4/page-io.c

+0 −10
Original line number Diff line number Diff line
@@ -136,16 +136,6 @@ static void ext4_release_io_end(ext4_io_end_t *io_end) 
	kmem_cache_free(io_end_cachep, io_end);

}



static void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)

{

	struct inode *inode = io_end->inode;



	io_end->flag &= ~EXT4_IO_END_UNWRITTEN;

	/* Wake up anyone waiting on unwritten extent conversion */

	if (atomic_dec_and_test(&EXT4_I(inode)->i_unwritten))

		wake_up_all(ext4_ioend_wq(inode));

}



/*

 * Check a range of space and convert unwritten extents to written. Note that

 * we are protected from truncate touching same part of extent tree by the

CRA Git | Maintained and supported by SUSTech CRA and CCSE