aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_ioctl.c
diff options
context:
space:
mode:
authorsandeen@sandeen.net <sandeen@sandeen.net>2008-11-25 22:20:08 -0500
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-12-02 01:09:43 -0500
commitd5547f9feea459dfc9e7313bd1d561394e2c129f (patch)
tree70ef06acb6247176df74974794fcb039400b79cd /fs/xfs/linux-2.6/xfs_ioctl.c
parentffae263a640b736a7206a0d7bd14ab44eb58cd28 (diff)
[XFS] Clean up some existing compat ioctl calls
Create a new xfs_ioctl.h file which has prototypes for ioctl helpers that may be called in compat mode. Change several compat ioctl cases which are IOW to simply copy in the userspace argument, then call the common ioctl helper. This also fixes xfs_compat_ioc_fsgeometry_v1(), which had it backwards before; it copied in an (empty) arg, then copied out the native result, which probably corrupted userspace. It should be translating on the copyout. Also, a bit of formatting cleanup for consistency, and conversion of all error returns to use XFS_ERROR(). 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_ioctl.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_ioctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 03c55b8fa373..498d3e15843b 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -68,7 +68,7 @@
68 * XFS_IOC_PATH_TO_HANDLE 68 * XFS_IOC_PATH_TO_HANDLE
69 * returns full handle for a path 69 * returns full handle for a path
70 */ 70 */
71STATIC int 71int
72xfs_find_handle( 72xfs_find_handle(
73 unsigned int cmd, 73 unsigned int cmd,
74 xfs_fsop_handlereq_t *hreq) 74 xfs_fsop_handlereq_t *hreq)
@@ -245,7 +245,7 @@ xfs_vget_fsop_handlereq(
245 return 0; 245 return 0;
246} 246}
247 247
248STATIC int 248int
249xfs_open_by_handle( 249xfs_open_by_handle(
250 xfs_mount_t *mp, 250 xfs_mount_t *mp,
251 xfs_fsop_handlereq_t *hreq, 251 xfs_fsop_handlereq_t *hreq,
@@ -355,7 +355,7 @@ do_readlink(
355} 355}
356 356
357 357
358STATIC int 358int
359xfs_readlink_by_handle( 359xfs_readlink_by_handle(
360 xfs_mount_t *mp, 360 xfs_mount_t *mp,
361 xfs_fsop_handlereq_t *hreq, 361 xfs_fsop_handlereq_t *hreq,
@@ -651,7 +651,7 @@ xfs_attrmulti_by_handle(
651 return -error; 651 return -error;
652} 652}
653 653
654STATIC int 654int
655xfs_ioc_space( 655xfs_ioc_space(
656 struct xfs_inode *ip, 656 struct xfs_inode *ip,
657 struct inode *inode, 657 struct inode *inode,