lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] struct path: convert sbus

Browse Source 
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Josef Sipek
2006-12-08 02:37:36 -08:00
committed by Linus Torvalds
parent d20343e740
commit 7fa95f726a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/sbus/char/bpp.c
View File

@@ -621,7 +621,7 @@ static long read_ecp(unsigned minor, char __user *c, unsigned long cnt)
static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos) static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos)
{ {
long rc; long rc;
unsigned minor = iminor(f->f_dentry->d_inode); unsigned minor = iminor(f->f_path.dentry->d_inode);
if (minor >= BPP_NO) return -ENODEV; if (minor >= BPP_NO) return -ENODEV;
if (!instances[minor].present) return -ENODEV; if (!instances[minor].present) return -ENODEV;
@@ -774,7 +774,7 @@ static long write_ecp(unsigned minor, const char __user *c, unsigned long cnt)
static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos) static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos)
{ {
long errno = 0; long errno = 0;
unsigned minor = iminor(f->f_dentry->d_inode); unsigned minor = iminor(f->f_path.dentry->d_inode);
if (minor >= BPP_NO) return -ENODEV; if (minor >= BPP_NO) return -ENODEV;
if (!instances[minor].present) return -ENODEV; if (!instances[minor].present) return -ENODEV;

2
drivers/sbus/char/cpwatchdog.c
View File

@@ -404,7 +404,7 @@ static long wd_compat_ioctl(struct file *file, unsigned int cmd,
case WIOCSTOP: case WIOCSTOP:
case WIOCGSTAT: case WIOCGSTAT:
lock_kernel(); lock_kernel();
rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg); rval = wd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
unlock_kernel(); unlock_kernel();
break; break;
/* everything else is handled by the generic compat layer */ /* everything else is handled by the generic compat layer */

2
drivers/sbus/char/display7seg.c
View File

@@ -121,7 +121,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
__u8 ireg = 0; __u8 ireg = 0;
int error = 0; int error = 0;
if (D7S_MINOR != iminor(file->f_dentry->d_inode)) if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))
return -ENODEV; return -ENODEV;
lock_kernel(); lock_kernel();

2
drivers/sbus/char/openprom.c
View File

@@ -676,7 +676,7 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
case OPROMSETCUR: case OPROMSETCUR:
case OPROMPCI2NODE: case OPROMPCI2NODE:
case OPROMPATH2NODE: case OPROMPATH2NODE:
rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg); rval = openprom_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
break; break;
} }

2
drivers/sbus/char/vfc_dev.c
View File

@@ -610,7 +610,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma)
unsigned int map_size, ret, map_offset; unsigned int map_size, ret, map_offset;
struct vfc_dev *dev; struct vfc_dev *dev;
dev = vfc_get_dev_ptr(iminor(file->f_dentry->d_inode)); dev = vfc_get_dev_ptr(iminor(file->f_path.dentry->d_inode));
if(dev == NULL) if(dev == NULL)
return -ENODEV; return -ENODEV;