diff options
| author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 02:37:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:28:49 -0800 |
| commit | 7fa95f726aba6033d7baffcfda484c31b8cfe153 (patch) | |
| tree | 924f8228c223b0f1c6365fdb541124f2b096f523 | |
| parent | d20343e7406a114a561030e683fafc4fdbc9c6bd (diff) | |
| download | linux-7fa95f726aba6033d7baffcfda484c31b8cfe153.tar.bz2 | |
[PATCH] struct path: convert sbus
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>
| -rw-r--r-- | drivers/sbus/char/bpp.c | 4 | ||||
| -rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/display7seg.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/openprom.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/vfc_dev.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 385f4f768311..ac7d1258efee 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c @@ -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) { 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 (!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) { 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 (!instances[minor].present) return -ENODEV; diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index f5803ecb1999..ad1c7db96cb4 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c @@ -404,7 +404,7 @@ static long wd_compat_ioctl(struct file *file, unsigned int cmd, case WIOCSTOP: case WIOCGSTAT: 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(); break; /* everything else is handled by the generic compat layer */ diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index d92bc8827a9e..a4909e0c7f83 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c @@ -121,7 +121,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) __u8 ireg = 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; lock_kernel(); diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 81ba2d71cee2..4e2a0e2dcc2e 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -676,7 +676,7 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd, case OPROMSETCUR: case OPROMPCI2NODE: 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; } diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 55b2b31bd7ab..2722af5d3404 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c @@ -610,7 +610,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma) unsigned int map_size, ret, map_offset; 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) return -ENODEV; |