Skip to content

Commit

Permalink
[XFS] Clean up some existing compat ioctl calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
sandeen authored and Lachlan McIlroy committed Dec 2, 2008
1 parent ffae263 commit d5547f9
Show file tree
Hide file tree
Showing 3 changed files with 171 additions and 91 deletions.
8 changes: 4 additions & 4 deletions fs/xfs/linux-2.6/xfs_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
* XFS_IOC_PATH_TO_HANDLE
* returns full handle for a path
*/
STATIC int
int
xfs_find_handle(
unsigned int cmd,
xfs_fsop_handlereq_t *hreq)
Expand Down Expand Up @@ -245,7 +245,7 @@ xfs_vget_fsop_handlereq(
return 0;
}

STATIC int
int
xfs_open_by_handle(
xfs_mount_t *mp,
xfs_fsop_handlereq_t *hreq,
Expand Down Expand Up @@ -355,7 +355,7 @@ do_readlink(
}


STATIC int
int
xfs_readlink_by_handle(
xfs_mount_t *mp,
xfs_fsop_handlereq_t *hreq,
Expand Down Expand Up @@ -651,7 +651,7 @@ xfs_attrmulti_by_handle(
return -error;
}

STATIC int
int
xfs_ioc_space(
struct xfs_inode *ip,
struct inode *inode,
Expand Down
47 changes: 47 additions & 0 deletions fs/xfs/linux-2.6/xfs_ioctl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2008 Silicon Graphics, Inc.
* All Rights Reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it would be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __XFS_IOCTL_H__
#define __XFS_IOCTL_H__

extern int
xfs_ioc_space(
struct xfs_inode *ip,
struct inode *inode,
struct file *filp,
int ioflags,
unsigned int cmd,
xfs_flock64_t *bf);

extern int
xfs_find_handle(
unsigned int cmd,
xfs_fsop_handlereq_t *hreq);

extern int
xfs_open_by_handle(
xfs_mount_t *mp,
xfs_fsop_handlereq_t *hreq,
struct file *parfilp,
struct inode *parinode);

extern int
xfs_readlink_by_handle(
xfs_mount_t *mp,
xfs_fsop_handlereq_t *hreq,
struct inode *parinode);
#endif
Loading

0 comments on commit d5547f9

Please sign in to comment.