diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-18 12:59:45 +1000 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-18 12:59:45 +1000 |
| commit | 65e67f5165c8a156b34ee7adf65d5ed3b16a910d (patch) | |
| tree | 6b2e82205ae59b2304d38880c15e62a229d70691 /fs/xfs/linux-2.6/xfs_ioctl.c | |
| parent | 3b2816be271b8b364294a5b48721a3e68af46cfa (diff) | |
| download | linux-stable-65e67f5165c8a156b34ee7adf65d5ed3b16a910d.tar.gz linux-stable-65e67f5165c8a156b34ee7adf65d5ed3b16a910d.tar.bz2 linux-stable-65e67f5165c8a156b34ee7adf65d5ed3b16a910d.zip | |
[XFS] Fix merge failure
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 6 |
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; |