[XFS] Fix merge failure

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 640c8b6b1956..bf7759793856 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -1090,10 +1090,12 @@ xfs_ioctl(
                 return xfs_ioc_fsgetxattr(ip, 0, arg);
         case XFS_IOC_FSGETXATTRA:
                 return xfs_ioc_fsgetxattr(ip, 1, arg);
+        case XFS_IOC_FSSETXATTR:
+                return xfs_ioc_fssetxattr(ip, filp, arg);
         case XFS_IOC_GETXFLAGS:
+                return xfs_ioc_getxflags(ip, arg);
         case XFS_IOC_SETXFLAGS:
-        case XFS_IOC_FSSETXATTR:
-                return xfs_ioc_xattr(ip, filp, cmd, arg);
+                return xfs_ioc_setxflags(ip, filp, arg);
 
         case XFS_IOC_FSSETDM: {
                 struct fsdmidata        dmi;