Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: actually enable the swapext compat handler

+1 -1
+1 -1
fs/xfs/linux-2.6/xfs_ioctl32.c
··· 619 619 case XFS_IOC_GETVERSION_32: 620 620 cmd = _NATIVE_IOC(cmd, long); 621 621 return xfs_file_ioctl(filp, cmd, p); 622 - case XFS_IOC_SWAPEXT: { 622 + case XFS_IOC_SWAPEXT_32: { 623 623 struct xfs_swapext sxp; 624 624 struct compat_xfs_swapext __user *sxu = arg; 625 625