diff options
| author | sandeen@sandeen.net <sandeen@sandeen.net> | 2008-11-25 21:20:10 -0600 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-02 17:15:09 +1100 |
| commit | 471d59103167c84f17b9bcfee22ed10b44ff206e (patch) | |
| tree | cca786d598f2d4c12f50ea6d8fbc6bdb057eeec1 /fs/xfs/linux-2.6/xfs_ioctl32.c | |
| parent | e94fc4a43e5c39f689e83caf6d2f0939081f5e6b (diff) | |
| download | op-kernel-dev-471d59103167c84f17b9bcfee22ed10b44ff206e.zip op-kernel-dev-471d59103167c84f17b9bcfee22ed10b44ff206e.tar.gz | |
[XFS] Add compat handlers for data & rt growfs ioctls
The args for XFS_IOC_FSGROWFSDATA and XFS_IOC_FSGROWFSRTA
have padding on the end on intel, so add arg copyin functions,
and then just call the growfs ioctl helpers.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 132f3dd..d1ac5d5 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c @@ -44,6 +44,8 @@ #include "xfs_dfrag.h" #include "xfs_vnodeops.h" #include "xfs_fsops.h" +#include "xfs_alloc.h" +#include "xfs_rtalloc.h" #include "xfs_ioctl.h" #include "xfs_ioctl32.h" @@ -85,6 +87,28 @@ xfs_compat_ioc_fsgeometry_v1( } STATIC int +xfs_compat_growfs_data_copyin( + struct xfs_growfs_data *in, + compat_xfs_growfs_data_t __user *arg32) +{ + if (get_user(in->newblocks, &arg32->newblocks) || + get_user(in->imaxpct, &arg32->imaxpct)) + return -XFS_ERROR(EFAULT); + return 0; +} + +STATIC int +xfs_compat_growfs_rt_copyin( + struct xfs_growfs_rt *in, + compat_xfs_growfs_rt_t __user *arg32) +{ + if (get_user(in->newblocks, &arg32->newblocks) || + get_user(in->extsize, &arg32->extsize)) + return -XFS_ERROR(EFAULT); + return 0; +} + +STATIC int xfs_inumbers_fmt_compat( void __user *ubuffer, const xfs_inogrp_t *buffer, @@ -367,6 +391,22 @@ xfs_compat_ioctl( } case XFS_IOC_FSGEOMETRY_V1_32: return xfs_compat_ioc_fsgeometry_v1(mp, arg); + case XFS_IOC_FSGROWFSDATA_32: { + struct xfs_growfs_data in; + + if (xfs_compat_growfs_data_copyin(&in, arg)) + return -XFS_ERROR(EFAULT); + error = xfs_growfs_data(mp, &in); + return -error; + } + case XFS_IOC_FSGROWFSRT_32: { + struct xfs_growfs_rt in; + + if (xfs_compat_growfs_rt_copyin(&in, arg)) + return -XFS_ERROR(EFAULT); + error = xfs_growfs_rt(mp, &in); + return -error; + } #else /* These are handled fine if no alignment issues */ case XFS_IOC_ALLOCSP: case XFS_IOC_FREESP: |
