This splits the swap extents bug fix into three patches as requested the bug fix, the tracing code and the variable name cleanup. Apart from splitting the patch, the only change is in the cleanup patch which makes xfs_swap_extents() static.