Merge branch 'xfs-dax-support' into for-next

diff --cc fs/xfs/xfs_file.c
index 3b7591224f4a6698d32371a927e70cb2a391f4a9,cfd9b4f5ad6e7dadfcdbfdd2163c99a229948fa2..84b2421b22ae51d4fb66b84baa6c49bf03e31226
--- 1/fs/xfs/xfs_file.c
--- 2/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -108,23 -110,30 +110,30 @@@ xfs_iozero
                if (bytes > count)
                        bytes = count;
  
-               status = pagecache_write_begin(NULL, mapping, pos, bytes,
-                                       AOP_FLAG_UNINTERRUPTIBLE,
-                                       &page, &fsdata);
-               if (status)
-                       break;
+               if (IS_DAX(VFS_I(ip))) {
+                       status = dax_zero_page_range(VFS_I(ip), pos, bytes,
+                                                    xfs_get_blocks_direct);
+                       if (status)
+                               break;
+               } else {
+                       status = pagecache_write_begin(NULL, mapping, pos, bytes,
+                                               AOP_FLAG_UNINTERRUPTIBLE,
+                                               &page, &fsdata);
+                       if (status)
+                               break;
  
-               zero_user(page, offset, bytes);
+                       zero_user(page, offset, bytes);
  
-               status = pagecache_write_end(NULL, mapping, pos, bytes, bytes,
-                                       page, fsdata);
-               WARN_ON(status <= 0); /* can't return less than zero! */
+                       status = pagecache_write_end(NULL, mapping, pos, bytes,
+                                               bytes, page, fsdata);
+                       WARN_ON(status <= 0); /* can't return less than zero! */
+                       status = 0;
+               }
                pos += bytes;
                count -= bytes;
-               status = 0;
        } while (count);
  
 -      return (-status);
 +      return status;
  }
  
  int

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