1 files changed, 38 insertions, 23 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index df0d4572d70a..1d7f5a7e063e 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -404,9 +404,8 @@ xfs_iformat(
             INT_GET(dip->di_core.di_nextents, ARCH_CONVERT) +
                 INT_GET(dip->di_core.di_anextents, ARCH_CONVERT) >
             INT_GET(dip->di_core.di_nblocks, ARCH_CONVERT))) {
-                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                        "corrupt dinode %Lu, extent total = %d, nblocks = %Lu."
-                        "  Unmount and run xfs_repair.",
+                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                        "corrupt dinode %Lu, extent total = %d, nblocks = %Lu.",
                         (unsigned long long)ip->i_ino,
                         (int)(INT_GET(dip->di_core.di_nextents, ARCH_CONVERT)
                             + INT_GET(dip->di_core.di_anextents, ARCH_CONVERT)),
@@ -418,9 +417,8 @@ xfs_iformat(
         }
 
         if (unlikely(INT_GET(dip->di_core.di_forkoff, ARCH_CONVERT) > ip->i_mount->m_sb.sb_inodesize)) {
-                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                        "corrupt dinode %Lu, forkoff = 0x%x."
-                        "  Unmount and run xfs_repair.",
+                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                        "corrupt dinode %Lu, forkoff = 0x%x.",
                         (unsigned long long)ip->i_ino,
                         (int)(INT_GET(dip->di_core.di_forkoff, ARCH_CONVERT)));
                 XFS_CORRUPTION_ERROR("xfs_iformat(2)", XFS_ERRLEVEL_LOW,
@@ -451,8 +449,9 @@ xfs_iformat(
                          * no local regular files yet
                          */
                         if (unlikely((INT_GET(dip->di_core.di_mode, ARCH_CONVERT) & S_IFMT) == S_IFREG)) {
-                                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                                        "corrupt inode (local format for regular file) %Lu.  Unmount and run xfs_repair.",
+                                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                                        "corrupt inode %Lu "
+                                        "(local format for regular file).",
                                         (unsigned long long) ip->i_ino);
                                 XFS_CORRUPTION_ERROR("xfs_iformat(4)",
                                                      XFS_ERRLEVEL_LOW,
@@ -462,8 +461,9 @@ xfs_iformat(
 
                         di_size = INT_GET(dip->di_core.di_size, ARCH_CONVERT);
                         if (unlikely(di_size > XFS_DFORK_DSIZE(dip, ip->i_mount))) {
-                                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                                        "corrupt inode %Lu (bad size %Ld for local inode).  Unmount and run xfs_repair.",
+                                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                                        "corrupt inode %Lu "
+                                        "(bad size %Ld for local inode).",
                                         (unsigned long long) ip->i_ino,
                                         (long long) di_size);
                                 XFS_CORRUPTION_ERROR("xfs_iformat(5)",
@@ -551,8 +551,9 @@ xfs_iformat_local(
          * kmem_alloc() or memcpy() below.
          */
         if (unlikely(size > XFS_DFORK_SIZE(dip, ip->i_mount, whichfork))) {
-                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                        "corrupt inode %Lu (bad size %d for local fork, size = %d).  Unmount and run xfs_repair.",
+                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                        "corrupt inode %Lu "
+                        "(bad size %d for local fork, size = %d).",
                         (unsigned long long) ip->i_ino, size,
                         XFS_DFORK_SIZE(dip, ip->i_mount, whichfork));
                 XFS_CORRUPTION_ERROR("xfs_iformat_local", XFS_ERRLEVEL_LOW,
@@ -610,8 +611,8 @@ xfs_iformat_extents(
          * kmem_alloc() or memcpy() below.
          */
         if (unlikely(size < 0 || size > XFS_DFORK_SIZE(dip, ip->i_mount, whichfork))) {
-                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                        "corrupt inode %Lu ((a)extents = %d).  Unmount and run xfs_repair.",
+                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                        "corrupt inode %Lu ((a)extents = %d).",
                         (unsigned long long) ip->i_ino, nex);
                 XFS_CORRUPTION_ERROR("xfs_iformat_extents(1)", XFS_ERRLEVEL_LOW,
                                      ip->i_mount, dip);
@@ -692,8 +693,8 @@ xfs_iformat_btree(
             || XFS_BMDR_SPACE_CALC(nrecs) >
                         XFS_DFORK_SIZE(dip, ip->i_mount, whichfork)
             || XFS_IFORK_NEXTENTS(ip, whichfork) > ip->i_d.di_nblocks)) {
-                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                        "corrupt inode %Lu (btree).  Unmount and run xfs_repair.",
+                xfs_fs_repair_cmn_err(CE_WARN, ip->i_mount,
+                        "corrupt inode %Lu (btree).",
                         (unsigned long long) ip->i_ino);
                 XFS_ERROR_REPORT("xfs_iformat_btree", XFS_ERRLEVEL_LOW,
                                  ip->i_mount);
@@ -809,6 +810,10 @@ _xfs_dic2xflags(
                         flags |= XFS_XFLAG_PROJINHERIT;
                 if (di_flags & XFS_DIFLAG_NOSYMLINKS)
                         flags |= XFS_XFLAG_NOSYMLINKS;
+                if (di_flags & XFS_DIFLAG_EXTSIZE)
+                        flags |= XFS_XFLAG_EXTSIZE;
+                if (di_flags & XFS_DIFLAG_EXTSZINHERIT)
+                        flags |= XFS_XFLAG_EXTSZINHERIT;
         }
 
         return flags;
@@ -1192,11 +1197,19 @@ xfs_ialloc(
                         if ((mode & S_IFMT) == S_IFDIR) {
                                 if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT)
                                         di_flags |= XFS_DIFLAG_RTINHERIT;
-                        } else {
+                                if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
+                                        di_flags |= XFS_DIFLAG_EXTSZINHERIT;
+                                        ip->i_d.di_extsize = pip->i_d.di_extsize;
+                                }
+                        } else if ((mode & S_IFMT) == S_IFREG) {
                                 if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT) {
                                         di_flags |= XFS_DIFLAG_REALTIME;
                                         ip->i_iocore.io_flags |= XFS_IOCORE_RT;
                                 }
+                                if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
+                                        di_flags |= XFS_DIFLAG_EXTSIZE;
+                                        ip->i_d.di_extsize = pip->i_d.di_extsize;
+                                }
                         }
                         if ((pip->i_d.di_flags & XFS_DIFLAG_NOATIME) &&
                             xfs_inherit_noatime)
@@ -1262,7 +1275,7 @@ xfs_isize_check(
         if ((ip->i_d.di_mode & S_IFMT) != S_IFREG)
                 return;
 
-        if ( ip->i_d.di_flags & XFS_DIFLAG_REALTIME )
+        if (ip->i_d.di_flags & (XFS_DIFLAG_REALTIME | XFS_DIFLAG_EXTSIZE))
                 return;
 
         nimaps = 2;
@@ -1765,22 +1778,19 @@ xfs_igrow_start(
         xfs_fsize_t     new_size,
         cred_t          *credp)
 {
-        xfs_fsize_t     isize;
         int             error;
 
         ASSERT(ismrlocked(&(ip->i_lock), MR_UPDATE) != 0);
         ASSERT(ismrlocked(&(ip->i_iolock), MR_UPDATE) != 0);
         ASSERT(new_size > ip->i_d.di_size);
 
-        error = 0;
-        isize = ip->i_d.di_size;
         /*
          * Zero any pages that may have been created by
          * xfs_write_file() beyond the end of the file
          * and any blocks between the old and new file sizes.
          */
-        error = xfs_zero_eof(XFS_ITOV(ip), &ip->i_iocore, new_size, isize,
-                                new_size);
+        error = xfs_zero_eof(XFS_ITOV(ip), &ip->i_iocore, new_size,
+                             ip->i_d.di_size, new_size);
         return error;
 }
 
@@ -3355,6 +3365,11 @@ xfs_iflush_int(
         ip->i_update_core = 0;
         SYNCHRONIZE();
 
+        /*
+         * Make sure to get the latest atime from the Linux inode.
+         */
+        xfs_synchronize_atime(ip);
+
         if (XFS_TEST_ERROR(INT_GET(dip->di_core.di_magic,ARCH_CONVERT) != XFS_DINODE_MAGIC,
                                mp, XFS_ERRTAG_IFLUSH_1, XFS_RANDOM_IFLUSH_1)) {
                 xfs_cmn_err(XFS_PTAG_IFLUSH, CE_ALERT, mp,