Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next

5 files changed, 14 insertions, 6 deletions

diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 7077103ac541..0bfafe108357 100644
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -287,9 +287,9 @@ The following sysctls are available for the XFS filesystem:
                 XFS_ERRLEVEL_LOW:       1
                 XFS_ERRLEVEL_HIGH:      5
 
-  fs.xfs.panic_mask             (Min: 0  Default: 0  Max: 127)
+  fs.xfs.panic_mask             (Min: 0  Default: 0  Max: 255)
         Causes certain error conditions to call BUG(). Value is a bitmask;
-        AND together the tags which represent errors which should cause panics:
+        OR together the tags which represent errors which should cause panics:
 
                 XFS_NO_PTAG                     0
                 XFS_PTAG_IFLUSH                 0x00000001
@@ -299,6 +299,7 @@ The following sysctls are available for the XFS filesystem:
                 XFS_PTAG_SHUTDOWN_CORRUPT       0x00000010
                 XFS_PTAG_SHUTDOWN_IOERROR       0x00000020
                 XFS_PTAG_SHUTDOWN_LOGERROR      0x00000040
+                XFS_PTAG_FSBLOCK_ZERO           0x00000080
 
         This option is intended for debugging only.
 
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index f7114527cd2f..fba6532efba4 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -488,6 +488,7 @@ xfs_growfs_data_private(
                 xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, nfree);
         if (dpct)
                 xfs_trans_mod_sb(tp, XFS_TRANS_SB_IMAXPCT, dpct);
+        xfs_trans_set_sync(tp);
         error = xfs_trans_commit(tp, 0);
         if (error)
                 return error;
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index b88ab927debe..f7afb86c9148 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1086,7 +1086,7 @@ out_cancel:
  *    to half the AG size to avoid alignment extending the extent beyond the
  *    limits of the AG.
  */
-int
+static int
 xfs_ioctl_setattr_check_extsize(
         struct xfs_inode        *ip,
         struct fsxattr          *fa)
@@ -1129,7 +1129,7 @@ xfs_ioctl_setattr_check_extsize(
         return 0;
 }
 
-int
+static int
 xfs_ioctl_setattr_check_projid(
         struct xfs_inode        *ip,
         struct fsxattr          *fa)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5ce76d01885d..f2449fd86926 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1111,6 +1111,11 @@ xfs_fs_statfs(
                                         statp->f_files,
                                         mp->m_maxicount);
 
+        /* If sb_icount overshot maxicount, report actual allocation */
+        statp->f_files = max_t(typeof(statp->f_files),
+                                        statp->f_files,
+                                        sbp->sb_icount);
+
         /* make sure statp->f_ffree does not underflow */
         ffree = statp->f_files - (sbp->sb_icount - sbp->sb_ifree);
         statp->f_ffree = max_t(__int64_t, ffree, 0);
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 0a4d4ab6d9a9..75798412859a 100644
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -327,9 +327,10 @@ xfs_trans_read_buf_map(
                 return -EIO;
         }
 
-        if (tp)
+        if (tp) {
                 _xfs_trans_bjoin(tp, bp, 1);
-        trace_xfs_trans_read_buf(bp->b_fspriv);
+                trace_xfs_trans_read_buf(bp->b_fspriv);
+        }
         *bpp = bp;
         return 0;