head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.27.02.13.55;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.27.02.13.55;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2007.01.05.08.33.49;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file isdn was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Got few more patches into -mm
@
text
@a0 86
isdn: change uses of f_{dentry,vfsmnt} to use f_path

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

This patch changes all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt}
in the isdn code.

Cc: kkeil@@suse.de
Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

diff -r ed8030e0f7d4 drivers/isdn/capi/capi.c
--- a/drivers/isdn/capi/capi.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/isdn/capi/capi.c	Mon Oct 23 23:25:48 2006 -0400
@@@@ -1010,7 +1010,7 @@@@ static int capinc_tty_open(struct tty_st
 {
 	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 -r ed8030e0f7d4 drivers/isdn/hysdn/hysdn_proclog.c
--- a/drivers/isdn/hysdn/hysdn_proclog.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/isdn/hysdn/hysdn_proclog.c	Mon Oct 23 23:25:51 2006 -0400
@@@@ -204,7 +204,7 @@@@ hysdn_log_read(struct file *file, char _
 {
 	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 @@@@ hysdn_log_poll(struct file *file, poll_t
 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 -r ed8030e0f7d4 drivers/isdn/i4l/isdn_common.c
--- a/drivers/isdn/i4l/isdn_common.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/isdn/i4l/isdn_common.c	Mon Oct 23 23:25:51 2006 -0400
@@@@ -1059,7 +1059,7 @@@@ static ssize_t
 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 @@@@ static ssize_t
 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 @@@@ isdn_poll(struct file *file, poll_table 
 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 -r ed8030e0f7d4 drivers/isdn/i4l/isdn_ppp.c
--- a/drivers/isdn/i4l/isdn_ppp.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/isdn/i4l/isdn_ppp.c	Mon Oct 23 23:25:51 2006 -0400
@@@@ -667,7 +667,7 @@@@ isdn_ppp_poll(struct file *file, poll_ta
 
 	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);

@


1.1.2.2
log
@Removed many patches already in vanilla
@
text
@@


