![Josef "Jeff" Sipek](/assets/img/avatar_default.png)
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the xfs filesystem. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
218 lines
5.9 KiB
C
218 lines
5.9 KiB
C
/*
|
|
* Copyright (c) 2004-2005 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
|
|
*/
|
|
#include <linux/compat.h>
|
|
#include <linux/init.h>
|
|
#include <linux/ioctl.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/types.h>
|
|
#include <linux/fs.h>
|
|
#include <asm/uaccess.h>
|
|
#include "xfs.h"
|
|
#include "xfs_types.h"
|
|
#include "xfs_fs.h"
|
|
#include "xfs_vfs.h"
|
|
#include "xfs_vnode.h"
|
|
#include "xfs_dfrag.h"
|
|
|
|
#define _NATIVE_IOC(cmd, type) \
|
|
_IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type))
|
|
|
|
#if defined(CONFIG_IA64) || defined(CONFIG_X86_64)
|
|
#define BROKEN_X86_ALIGNMENT
|
|
/* on ia32 l_start is on a 32-bit boundary */
|
|
typedef struct xfs_flock64_32 {
|
|
__s16 l_type;
|
|
__s16 l_whence;
|
|
__s64 l_start __attribute__((packed));
|
|
/* len == 0 means until end of file */
|
|
__s64 l_len __attribute__((packed));
|
|
__s32 l_sysid;
|
|
__u32 l_pid;
|
|
__s32 l_pad[4]; /* reserve area */
|
|
} xfs_flock64_32_t;
|
|
|
|
#define XFS_IOC_ALLOCSP_32 _IOW ('X', 10, struct xfs_flock64_32)
|
|
#define XFS_IOC_FREESP_32 _IOW ('X', 11, struct xfs_flock64_32)
|
|
#define XFS_IOC_ALLOCSP64_32 _IOW ('X', 36, struct xfs_flock64_32)
|
|
#define XFS_IOC_FREESP64_32 _IOW ('X', 37, struct xfs_flock64_32)
|
|
#define XFS_IOC_RESVSP_32 _IOW ('X', 40, struct xfs_flock64_32)
|
|
#define XFS_IOC_UNRESVSP_32 _IOW ('X', 41, struct xfs_flock64_32)
|
|
#define XFS_IOC_RESVSP64_32 _IOW ('X', 42, struct xfs_flock64_32)
|
|
#define XFS_IOC_UNRESVSP64_32 _IOW ('X', 43, struct xfs_flock64_32)
|
|
|
|
/* just account for different alignment */
|
|
STATIC unsigned long
|
|
xfs_ioctl32_flock(
|
|
unsigned long arg)
|
|
{
|
|
xfs_flock64_32_t __user *p32 = (void __user *)arg;
|
|
xfs_flock64_t __user *p = compat_alloc_user_space(sizeof(*p));
|
|
|
|
if (copy_in_user(&p->l_type, &p32->l_type, sizeof(s16)) ||
|
|
copy_in_user(&p->l_whence, &p32->l_whence, sizeof(s16)) ||
|
|
copy_in_user(&p->l_start, &p32->l_start, sizeof(s64)) ||
|
|
copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
|
|
copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
|
|
copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
|
|
copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
|
|
return -EFAULT;
|
|
|
|
return (unsigned long)p;
|
|
}
|
|
|
|
#else
|
|
|
|
typedef struct xfs_fsop_bulkreq32 {
|
|
compat_uptr_t lastip; /* last inode # pointer */
|
|
__s32 icount; /* count of entries in buffer */
|
|
compat_uptr_t ubuffer; /* user buffer for inode desc. */
|
|
__s32 ocount; /* output count pointer */
|
|
} xfs_fsop_bulkreq32_t;
|
|
|
|
STATIC unsigned long
|
|
xfs_ioctl32_bulkstat(
|
|
unsigned long arg)
|
|
{
|
|
xfs_fsop_bulkreq32_t __user *p32 = (void __user *)arg;
|
|
xfs_fsop_bulkreq_t __user *p = compat_alloc_user_space(sizeof(*p));
|
|
u32 addr;
|
|
|
|
if (get_user(addr, &p32->lastip) ||
|
|
put_user(compat_ptr(addr), &p->lastip) ||
|
|
copy_in_user(&p->icount, &p32->icount, sizeof(s32)) ||
|
|
get_user(addr, &p32->ubuffer) ||
|
|
put_user(compat_ptr(addr), &p->ubuffer) ||
|
|
get_user(addr, &p32->ocount) ||
|
|
put_user(compat_ptr(addr), &p->ocount))
|
|
return -EFAULT;
|
|
|
|
return (unsigned long)p;
|
|
}
|
|
#endif
|
|
|
|
STATIC long
|
|
xfs_compat_ioctl(
|
|
int mode,
|
|
struct file *file,
|
|
unsigned cmd,
|
|
unsigned long arg)
|
|
{
|
|
struct inode *inode = file->f_path.dentry->d_inode;
|
|
bhv_vnode_t *vp = vn_from_inode(inode);
|
|
int error;
|
|
|
|
switch (cmd) {
|
|
case XFS_IOC_DIOINFO:
|
|
case XFS_IOC_FSGEOMETRY_V1:
|
|
case XFS_IOC_FSGEOMETRY:
|
|
case XFS_IOC_GETVERSION:
|
|
case XFS_IOC_GETXFLAGS:
|
|
case XFS_IOC_SETXFLAGS:
|
|
case XFS_IOC_FSGETXATTR:
|
|
case XFS_IOC_FSSETXATTR:
|
|
case XFS_IOC_FSGETXATTRA:
|
|
case XFS_IOC_FSSETDM:
|
|
case XFS_IOC_GETBMAP:
|
|
case XFS_IOC_GETBMAPA:
|
|
case XFS_IOC_GETBMAPX:
|
|
/* not handled
|
|
case XFS_IOC_FD_TO_HANDLE:
|
|
case XFS_IOC_PATH_TO_HANDLE:
|
|
case XFS_IOC_PATH_TO_FSHANDLE:
|
|
case XFS_IOC_OPEN_BY_HANDLE:
|
|
case XFS_IOC_FSSETDM_BY_HANDLE:
|
|
case XFS_IOC_READLINK_BY_HANDLE:
|
|
case XFS_IOC_ATTRLIST_BY_HANDLE:
|
|
case XFS_IOC_ATTRMULTI_BY_HANDLE:
|
|
*/
|
|
case XFS_IOC_FSCOUNTS:
|
|
case XFS_IOC_SET_RESBLKS:
|
|
case XFS_IOC_GET_RESBLKS:
|
|
case XFS_IOC_FSGROWFSDATA:
|
|
case XFS_IOC_FSGROWFSLOG:
|
|
case XFS_IOC_FSGROWFSRT:
|
|
case XFS_IOC_FREEZE:
|
|
case XFS_IOC_THAW:
|
|
case XFS_IOC_GOINGDOWN:
|
|
case XFS_IOC_ERROR_INJECTION:
|
|
case XFS_IOC_ERROR_CLEARALL:
|
|
break;
|
|
|
|
#ifdef BROKEN_X86_ALIGNMENT
|
|
/* xfs_flock_t has wrong u32 vs u64 alignment */
|
|
case XFS_IOC_ALLOCSP_32:
|
|
case XFS_IOC_FREESP_32:
|
|
case XFS_IOC_ALLOCSP64_32:
|
|
case XFS_IOC_FREESP64_32:
|
|
case XFS_IOC_RESVSP_32:
|
|
case XFS_IOC_UNRESVSP_32:
|
|
case XFS_IOC_RESVSP64_32:
|
|
case XFS_IOC_UNRESVSP64_32:
|
|
arg = xfs_ioctl32_flock(arg);
|
|
cmd = _NATIVE_IOC(cmd, struct xfs_flock64);
|
|
break;
|
|
|
|
#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:
|
|
break;
|
|
|
|
/* xfs_bstat_t still has wrong u32 vs u64 alignment */
|
|
case XFS_IOC_SWAPEXT:
|
|
break;
|
|
|
|
case XFS_IOC_FSBULKSTAT_SINGLE:
|
|
case XFS_IOC_FSBULKSTAT:
|
|
case XFS_IOC_FSINUMBERS:
|
|
arg = xfs_ioctl32_bulkstat(arg);
|
|
break;
|
|
#endif
|
|
default:
|
|
return -ENOIOCTLCMD;
|
|
}
|
|
|
|
error = bhv_vop_ioctl(vp, inode, file, mode, cmd, (void __user *)arg);
|
|
VMODIFY(vp);
|
|
|
|
return error;
|
|
}
|
|
|
|
long
|
|
xfs_file_compat_ioctl(
|
|
struct file *file,
|
|
unsigned cmd,
|
|
unsigned long arg)
|
|
{
|
|
return xfs_compat_ioctl(0, file, cmd, arg);
|
|
}
|
|
|
|
long
|
|
xfs_file_compat_invis_ioctl(
|
|
struct file *file,
|
|
unsigned cmd,
|
|
unsigned long arg)
|
|
{
|
|
return xfs_compat_ioctl(IO_INVIS, file, cmd, arg);
|
|
}
|