[GIT PULL 22/22] xfs: rollup of various bug fixes