korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[XFS] Fix compiler warning and small code inconsistencies in compat

Browse Source 
ioctl32 land.

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:25590a

Signed-off-by: Nathan Scott <nathans@sgi.com>
This commit is contained in:
Nathan Scott 2006-03-29 08:55:47 +10:00
parent c41564b5af
commit e0edd5962b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ xfs_ioctl32_flock(
copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) || copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32))) copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
return -EFAULT; return -EFAULT;
return (unsigned long)p; return (unsigned long)p;
} }
@ -107,11 +107,15 @@ xfs_ioctl32_bulkstat(
#endif #endif
STATIC long STATIC long
xfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg) xfs_compat_ioctl(
int mode,
struct file *file,
unsigned cmd,
unsigned long arg)
{ {
struct inode *inode = file->f_dentry->d_inode;
vnode_t *vp = vn_from_inode(inode);
int error; int error;
struct inode *inode = f->f_dentry->d_inode;
vnode_t *vp = vn_to_inode(inode);
switch (cmd) { switch (cmd) {
case XFS_IOC_DIOINFO: case XFS_IOC_DIOINFO:
@ -189,7 +193,7 @@ xfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
VOP_IOCTL(vp, inode, f, mode, cmd, (void __user *)arg, error); VOP_IOCTL(vp, inode, file, mode, cmd, (void __user *)arg, error);
VMODIFY(vp); VMODIFY(vp);
return error; return error;
@ -197,18 +201,18 @@ xfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
long long
xfs_file_compat_ioctl( xfs_file_compat_ioctl(
struct file *f, struct file *file,
unsigned cmd, unsigned cmd,
unsigned long arg) unsigned long arg)
{ {
return xfs_compat_ioctl(0, f, cmd, arg); return xfs_compat_ioctl(0, file, cmd, arg);
} }
long long
xfs_file_compat_invis_ioctl( xfs_file_compat_invis_ioctl(
struct file *f, struct file *file,
unsigned cmd, unsigned cmd,
unsigned long arg) unsigned long arg)
{ {
return xfs_compat_ioctl(IO_INVIS, f, cmd, arg); return xfs_compat_ioctl(IO_INVIS, file, cmd, arg);
} }