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

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
  ...

diff --cc fs/dax.c
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/ext4/ext4.h
index 393689dfa1aff8f17aad517c12a0a55b808a505e,56c12df107ab5f7c785c845a0a8bec42a50bcd75..c0474351986597cda60b574cacf325490ab2b157
--- 1/fs/ext4/ext4.h
--- 2/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -1511,15 -1504,16 +1511,6 @@@ static inline int ext4_valid_inum(struc
                 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)
 -static inline ext4_io_end_t *ext4_inode_aio(struct inode *inode)
--{
-       if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
-               io_end->flag |= EXT4_IO_END_UNWRITTEN;
-               atomic_inc(&EXT4_I(inode)->i_unwritten);
-       }
 -      return inode->i_private;
 -}
 -
 -static inline void ext4_inode_aio_set(struct inode *inode, ext4_io_end_t *io)
 -{
 -      inode->i_private = io;
--}
--
  /*
   * Inode dynamic state flags
   */

diff --cc fs/ext4/inode.c
index b2e9576450eb92c3f254a51e8b2392f5ba30b054,2b98171a943296382d40ba4d6e6e1f6a996e129a..dab84a2530ff3e05794d9b3c602e0d246937c8a3
--- 1/fs/ext4/inode.c
--- 2/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -3289,10 -3161,10 +3289,10 @@@ 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 = iocb->private;
 +        ext4_io_end_t *io_end = private;
  
        /* if not async direct IO just return */
        if (!io_end)
@@@ -3300,8 -3172,18 +3300,16 @@@
  
        ext_debug("ext4_end_io_dio(): io_end 0x%p "
                  "for inode %lu, iocb 0x%p, offset %llu, size %zd\n",
 -                iocb->private, io_end->inode->i_ino, iocb, offset,
 -                size);
 +                io_end, io_end->inode->i_ino, iocb, offset, size);
  
 -      iocb->private = NULL;
+       /*
+        * 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);

diff --cc fs/ext4/page-io.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/xfs/xfs_aops.c
index 5c57b7b40728904e0ad9c5641563df57400e76f9,7ba680e572fce603734721d998779b23b4005635..d445a64b979e963dccbef0a721989c112351a97e
--- 1/fs/xfs/xfs_aops.c
--- 2/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -1207,12 -1006,16 +1006,20 @@@ xfs_vm_writepages
        struct address_space    *mapping,
        struct writeback_control *wbc)
  {
+       struct xfs_writepage_ctx wpc = {
+               .io_type = XFS_IO_INVALID,
+       };
+       int                     ret;
+ 
        xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);
-       return generic_writepages(mapping, wbc);
 +      if (dax_mapping(mapping))
 +              return dax_writeback_mapping_range(mapping,
 +                              xfs_find_bdev_for_inode(mapping->host), wbc);
 +
+       ret = write_cache_pages(mapping, wbc, xfs_do_writepage, &wpc);
+       if (wpc.ioend)
+               ret = xfs_submit_ioend(wbc, wpc.ioend, ret);
+       return ret;
  }
  
  /*

diff --cc fs/xfs/xfs_aops.h
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc include/linux/fs.h
Simple merge