[PATCH] struct path: convert isdn

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>

4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 11844bbfe933..787a630a8e56 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1010,7 +1010,7 @@ static int capinc_tty_open(struct tty_struct * tty, struct file * file)
 {
         struct capiminor *mp;
 
-        if ((mp = capiminor_find(iminor(file->f_dentry->d_inode))) == 0)
+        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == 0)
                 return -ENXIO;
         if (mp->nccip == 0)
                 return -ENXIO;
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index fcd49920b220..4d238eff1773 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -204,7 +204,7 @@ hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
         struct log_data *inf;
         int len;
-        struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
         struct procdata *pd = NULL;
         hysdn_card *card;
 
@@ -354,7 +354,7 @@ static unsigned int
 hysdn_log_poll(struct file *file, poll_table * wait)
 {
         unsigned int mask = 0;
-        struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
         hysdn_card *card;
         struct procdata *pd = NULL;
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 69aee2602aa6..a610a05aa217 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1059,7 +1059,7 @@ isdn_info_update(void)
 static ssize_t
 isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
-        uint minor = iminor(file->f_dentry->d_inode);
+        uint minor = iminor(file->f_path.dentry->d_inode);
         int len = 0;
         int drvidx;
         int chidx;
@@ -1166,7 +1166,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 static ssize_t
 isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
-        uint minor = iminor(file->f_dentry->d_inode);
+        uint minor = iminor(file->f_path.dentry->d_inode);
         int drvidx;
         int chidx;
         int retval;
@@ -1228,7 +1228,7 @@ static unsigned int
 isdn_poll(struct file *file, poll_table * wait)
 {
         unsigned int mask = 0;
-        unsigned int minor = iminor(file->f_dentry->d_inode);
+        unsigned int minor = iminor(file->f_path.dentry->d_inode);
         int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
 
         lock_kernel();
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 119412d6bd15..175199088bf4 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -667,7 +667,7 @@ isdn_ppp_poll(struct file *file, poll_table * wait)
 
         if (is->debug & 0x2)
                 printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",
-                                iminor(file->f_dentry->d_inode));
+                                iminor(file->f_path.dentry->d_inode));
 
         /* just registers wait_queue hook. This doesn't really wait. */
         poll_wait(file, &is->wq, wait);