renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

[XFS] Reorder xfs_ioctl32.c for some tidiness

Browse Source 
Put things in IMHO a more readable order, now
that it's all done; add some comments.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
sandeen@sandeen.net 2008-11-25 21:20:17 -06:00 committed by Lachlan McIlroy
parent 710d62aaaf
commit e5d412f178
1 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
fs/xfs/linux-2.6/xfs_ioctl32.c
View File

@ -16,11 +16,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/init.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/syscalls.h>
#include <linux/types.h>
#include <linux/fs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "xfs.h" #include "xfs.h"
#include "xfs_fs.h" #include "xfs_fs.h"
@ -131,7 +127,7 @@ xfs_inumbers_fmt_compat(
#else #else
#define xfs_inumbers_fmt_compat xfs_inumbers_fmt #define xfs_inumbers_fmt_compat xfs_inumbers_fmt
#endif #endif /* BROKEN_X86_ALIGNMENT */
STATIC int STATIC int
xfs_ioctl32_bstime_copyin( xfs_ioctl32_bstime_copyin(
@ -617,6 +613,7 @@ xfs_compat_ioctl(
xfs_itrace_entry(XFS_I(inode)); xfs_itrace_entry(XFS_I(inode));
switch (cmd) { switch (cmd) {
/* No size or alignment issues on any arch */
case XFS_IOC_DIOINFO: case XFS_IOC_DIOINFO:
case XFS_IOC_FSGEOMETRY: case XFS_IOC_FSGEOMETRY:
case XFS_IOC_FSGETXATTR: case XFS_IOC_FSGETXATTR:
@ -629,35 +626,28 @@ xfs_compat_ioctl(
case XFS_IOC_FSCOUNTS: case XFS_IOC_FSCOUNTS:
case XFS_IOC_SET_RESBLKS: case XFS_IOC_SET_RESBLKS:
case XFS_IOC_GET_RESBLKS: case XFS_IOC_GET_RESBLKS:
case XFS_IOC_FSGROWFSDATA:
case XFS_IOC_FSGROWFSLOG: case XFS_IOC_FSGROWFSLOG:
case XFS_IOC_FSGROWFSRT:
case XFS_IOC_FREEZE: case XFS_IOC_FREEZE:
case XFS_IOC_THAW: case XFS_IOC_THAW:
case XFS_IOC_GOINGDOWN: case XFS_IOC_GOINGDOWN:
case XFS_IOC_ERROR_INJECTION: case XFS_IOC_ERROR_INJECTION:
case XFS_IOC_ERROR_CLEARALL: case XFS_IOC_ERROR_CLEARALL:
break; return xfs_ioctl(ip, filp, ioflags, cmd, arg);
#ifndef BROKEN_X86_ALIGNMENT
case XFS_IOC_GETXFLAGS_32: /* These are handled fine if no alignment issues */
case XFS_IOC_SETXFLAGS_32: case XFS_IOC_ALLOCSP:
case XFS_IOC_GETVERSION_32: case XFS_IOC_FREESP:
cmd = _NATIVE_IOC(cmd, long); case XFS_IOC_RESVSP:
break; case XFS_IOC_UNRESVSP:
case XFS_IOC_SWAPEXT: { case XFS_IOC_ALLOCSP64:
struct xfs_swapext sxp; case XFS_IOC_FREESP64:
struct compat_xfs_swapext __user *sxu = arg; case XFS_IOC_RESVSP64:
case XFS_IOC_UNRESVSP64:
/* Bulk copy in up to the sx_stat field, then grab bstat */ case XFS_IOC_FSGEOMETRY_V1:
if (copy_from_user(&sxp, sxu, case XFS_IOC_FSGROWFSDATA:
offsetof(xfs_swapext_t, sx_stat)) || case XFS_IOC_FSGROWFSRT:
xfs_ioctl32_bstat_copyin(&sxp.sx_stat, &sxu->sx_stat)) return xfs_ioctl(ip, filp, ioflags, cmd, arg);
return -XFS_ERROR(EFAULT); #else
error = xfs_swapext(&sxp);
return -error;
}
#ifdef BROKEN_X86_ALIGNMENT
/* xfs_flock_t has wrong u32 vs u64 alignment */
case XFS_IOC_ALLOCSP_32: case XFS_IOC_ALLOCSP_32:
case XFS_IOC_FREESP_32: case XFS_IOC_FREESP_32:
case XFS_IOC_ALLOCSP64_32: case XFS_IOC_ALLOCSP64_32:
@ -691,18 +681,25 @@ xfs_compat_ioctl(
error = xfs_growfs_rt(mp, &in); error = xfs_growfs_rt(mp, &in);
return -error; return -error;
} }
#else /* These are handled fine if no alignment issues */
case XFS_IOC_ALLOCSP:
case XFS_IOC_FREESP:
case XFS_IOC_RESVSP:
case XFS_IOC_UNRESVSP:
case XFS_IOC_ALLOCSP64:
case XFS_IOC_FREESP64:
case XFS_IOC_RESVSP64:
case XFS_IOC_UNRESVSP64:
case XFS_IOC_FSGEOMETRY_V1:
break;
#endif #endif
/* long changes size, but xfs only copiese out 32 bits */
case XFS_IOC_GETXFLAGS_32:
case XFS_IOC_SETXFLAGS_32:
case XFS_IOC_GETVERSION_32:
cmd = _NATIVE_IOC(cmd, long);
return xfs_ioctl(ip, filp, ioflags, cmd, arg);
case XFS_IOC_SWAPEXT: {
struct xfs_swapext sxp;
struct compat_xfs_swapext __user *sxu = arg;
/* Bulk copy in up to the sx_stat field, then copy bstat */
if (copy_from_user(&sxp, sxu,
offsetof(struct xfs_swapext, sx_stat)) ||
xfs_ioctl32_bstat_copyin(&sxp.sx_stat, &sxu->sx_stat))
return -XFS_ERROR(EFAULT);
error = xfs_swapext(&sxp);
return -error;
}
case XFS_IOC_FSBULKSTAT_32: case XFS_IOC_FSBULKSTAT_32:
case XFS_IOC_FSBULKSTAT_SINGLE_32: case XFS_IOC_FSBULKSTAT_SINGLE_32:
case XFS_IOC_FSINUMBERS_32: case XFS_IOC_FSINUMBERS_32:
@ -740,9 +737,6 @@ xfs_compat_ioctl(
default: default:
return -XFS_ERROR(ENOIOCTLCMD); return -XFS_ERROR(ENOIOCTLCMD);
} }
error = xfs_ioctl(ip, filp, ioflags, cmd, arg);
return error;
} }
long long