*** BLURB HERE *** Zizhi Wo (2): Revert "xfs: split xfs_mod_freecounter" xfs: Fix data overflow in xfs_mod_fdblocks() fs/xfs/libxfs/xfs_ag.c | 4 ++- fs/xfs/libxfs/xfs_ag_resv.c | 24 +++++++++---- fs/xfs/libxfs/xfs_ag_resv.h | 2 +- fs/xfs/libxfs/xfs_alloc.c | 4 +-- fs/xfs/libxfs/xfs_bmap.c | 21 ++++++------ fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/xfs_fsops.c | 29 +++++++++++----- fs/xfs/xfs_fsops.h | 2 +- fs/xfs/xfs_mount.c | 67 ++++++++++++++++++------------------- fs/xfs/xfs_mount.h | 27 +++++---------- fs/xfs/xfs_super.c | 6 +++- fs/xfs/xfs_trace.h | 1 + fs/xfs/xfs_trans.c | 21 ++++++++---- 13 files changed, 117 insertions(+), 93 deletions(-) -- 2.46.1