Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 471d5910 authored by sandeen@sandeen.net's avatar sandeen@sandeen.net Committed by Lachlan McIlroy
Browse files

[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: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent e94fc4a4

fs/xfs/linux-2.6/xfs_ioctl32.c

+40 −0
Original line number Diff line number Diff line
@@ -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"
@@ -84,6 +86,28 @@ xfs_compat_ioc_fsgeometry_v1( 
	return 0;

}



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,
@@ -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:

fs/xfs/linux-2.6/xfs_ioctl32.h

+14 −0
Original line number Diff line number Diff line
@@ -177,6 +177,20 @@ typedef struct compat_xfs_inogrp { 
	__u64		xi_allocmask;	/* mask of allocated inodes	*/

} __attribute__((packed)) compat_xfs_inogrp_t;



/* These growfs input structures have padding on the end, so must translate */

typedef struct compat_xfs_growfs_data {

	__u64		newblocks;	/* new data subvol size, fsblocks */

	__u32		imaxpct;	/* new inode space percentage limit */

} __attribute__((packed)) compat_xfs_growfs_data_t;



typedef struct compat_xfs_growfs_rt {

	__u64		newblocks;	/* new realtime size, fsblocks */

	__u32		extsize;	/* new realtime extent size, fsblocks */

} __attribute__((packed)) compat_xfs_growfs_rt_t;



#define XFS_IOC_FSGROWFSDATA_32 _IOW('X', 110, struct compat_xfs_growfs_data)

#define XFS_IOC_FSGROWFSRT_32   _IOW('X', 112, struct compat_xfs_growfs_rt)



#endif /* BROKEN_X86_ALIGNMENT */



#endif /* __XFS_IOCTL32_H__ */