diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:25:14 -0700 |
| commit | 0edfa2b1b5a5e1475e76dd3c792447687d966de4 (patch) | |
| tree | a811a6955bb0fffc883e59eb261206b132e9e6dc | |
| parent | 5a09adf13067609d8ab9fcae11dc99fd0084e35c (diff) | |
| parent | 3725867dccfb83e4b0cff64e916a04258f300591 (diff) | |
| download | linux-3.10-0edfa2b1b5a5e1475e76dd3c792447687d966de4.tar.gz linux-3.10-0edfa2b1b5a5e1475e76dd3c792447687d966de4.tar.bz2 linux-3.10-0edfa2b1b5a5e1475e76dd3c792447687d966de4.zip | |
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
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 0882d166239..eafcc7c1870 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c @@ -619,7 +619,7 @@ xfs_file_compat_ioctl( case XFS_IOC_GETVERSION_32: cmd = _NATIVE_IOC(cmd, long); return xfs_file_ioctl(filp, cmd, p); - case XFS_IOC_SWAPEXT: { + case XFS_IOC_SWAPEXT_32: { struct xfs_swapext sxp; struct compat_xfs_swapext __user *sxu = arg; |