[XFS] Fix merge failure

65e67f51 · Lachlan McIlroy · 3b2816be · 65e67f51
Commit 65e67f51 authored 17 years ago by Lachlan McIlroy
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

fs/xfs/linux-2.6/xfs_ioctl.c fs/xfs/linux-2.6/xfs_ioctl.c +4 -2

No files found.
--- 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;