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 s390-drivers was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Got few more patches into -mm
@
text
@a0 60
s390 drivers: 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 s390 drivers.

Cc: linux390@@de.ibm.com
Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

diff -r ed8030e0f7d4 drivers/s390/block/dasd_ioctl.c
--- a/drivers/s390/block/dasd_ioctl.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/s390/block/dasd_ioctl.c	Mon Oct 23 23:26:16 2006 -0400
@@@@ -430,7 +430,7 @@@@ dasd_compat_ioctl(struct file *filp, uns
 	int rval;
 
 	lock_kernel();
-	rval = dasd_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+	rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
 	unlock_kernel();
 
 	return (rval == -EINVAL) ? -ENOIOCTLCMD : rval;
diff -r ed8030e0f7d4 drivers/s390/char/fs3270.c
--- a/drivers/s390/char/fs3270.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/s390/char/fs3270.c	Mon Oct 23 23:26:16 2006 -0400
@@@@ -419,9 +419,9 @@@@ fs3270_open(struct inode *inode, struct 
 	struct idal_buffer *ib;
 	int minor, rc;
 
-	if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR)
+	if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
 		return -ENODEV;
-	minor = iminor(filp->f_dentry->d_inode);
+	minor = iminor(filp->f_path.dentry->d_inode);
 	/* Check for minor 0 multiplexer. */
 	if (minor == 0) {
 		if (!current->signal->tty)
diff -r ed8030e0f7d4 drivers/s390/char/tape_char.c
--- a/drivers/s390/char/tape_char.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/s390/char/tape_char.c	Mon Oct 23 23:26:17 2006 -0400
@@@@ -298,13 +298,13 @@@@ tapechar_open (struct inode *inode, stru
 	int minor, rc;
 
 	DBF_EVENT(6, "TCHAR:open: %i:%i\n",
-		imajor(filp->f_dentry->d_inode),
-		iminor(filp->f_dentry->d_inode));
-
-	if (imajor(filp->f_dentry->d_inode) != tapechar_major)
+		imajor(filp->f_path.dentry->d_inode),
+		iminor(filp->f_path.dentry->d_inode));
+
+	if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
 		return -ENODEV;
 
-	minor = iminor(filp->f_dentry->d_inode);
+	minor = iminor(filp->f_path.dentry->d_inode);
 	device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
 	if (IS_ERR(device)) {
 		DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");

@


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


