Minor tweaks for 5.16:
 * Clean up open-coded swap() calls.
 * A little bit of #ifdef golf to complete the reunification of the
   kernel and userspace libxfs source code.