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


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

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

1.1.2.2
date	2006.10.24.07.45.06;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.10.24.08.08.24;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.10.27.15.24.18;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Fix remainder of the kernel's f_{dentry,vfsmnt} usage
@
text
@a0 70
diff -r ed8030e0f7d4 drivers/sbus/char/bpp.c
--- a/drivers/sbus/char/bpp.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/sbus/char/bpp.c	Mon Oct 23 23:26:18 2006 -0400
@@@@ -621,7 +621,7 @@@@ static ssize_t bpp_read(struct file *f, 
 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 ssize_t bpp_write(struct file *f,
 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 -r ed8030e0f7d4 drivers/sbus/char/cpwatchdog.c
--- a/drivers/sbus/char/cpwatchdog.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/sbus/char/cpwatchdog.c	Mon Oct 23 23:26:18 2006 -0400
@@@@ -404,7 +404,7 @@@@ static long wd_compat_ioctl(struct file 
 	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 -r ed8030e0f7d4 drivers/sbus/char/display7seg.c
--- a/drivers/sbus/char/display7seg.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/sbus/char/display7seg.c	Mon Oct 23 23:26:18 2006 -0400
@@@@ -121,7 +121,7 @@@@ static long d7s_ioctl(struct file *file,
 	__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 -r ed8030e0f7d4 drivers/sbus/char/openprom.c
--- a/drivers/sbus/char/openprom.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/sbus/char/openprom.c	Mon Oct 23 23:26:18 2006 -0400
@@@@ -676,7 +676,7 @@@@ static long openprom_compat_ioctl(struct
 	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 -r ed8030e0f7d4 drivers/sbus/char/vfc_dev.c
--- a/drivers/sbus/char/vfc_dev.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/sbus/char/vfc_dev.c	Mon Oct 23 23:26:18 2006 -0400
@@@@ -610,7 +610,7 @@@@ static int vfc_mmap(struct file *file, s
 	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;
 

@


1.1.2.2
log
@reorder, rename and add descriptions to the remainder of f_{dentry,vfsmnt}
patches
@
text
@a0 7
sbus: change uses of f_{dentry,vfsmnt} to use f_path

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

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

@


1.1.2.3
log
@Added "From:" lines
@
text
@a2 2
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

@


1.1.2.4
log
@Remove old copies of the struct_file patches
@
text
@@


