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.17;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file block_drivers 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 67
diff -r ed8030e0f7d4 drivers/block/acsi_slm.c
--- a/drivers/block/acsi_slm.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/block/acsi_slm.c	Mon Oct 23 23:25:35 2006 -0400
@@@@ -363,7 +363,7 @@@@ static ssize_t slm_read( struct file *fi
 						 loff_t *ppos )
 
 {
-	struct inode *node = file->f_dentry->d_inode;
+	struct inode *node = file->f_path.dentry->d_inode;
 	unsigned long page;
 	int length;
 	int end;
@@@@ -618,7 +618,7 @@@@ static ssize_t slm_write( struct file *f
 						  loff_t *ppos )
 
 {
-	struct inode *node = file->f_dentry->d_inode;
+	struct inode *node = file->f_path.dentry->d_inode;
 	int		device = iminor(node);
 	int		n, filled, w, h;
 
diff -r ed8030e0f7d4 drivers/block/cciss.c
--- a/drivers/block/cciss.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/block/cciss.c	Mon Oct 23 23:25:35 2006 -0400
@@@@ -529,7 +529,7 @@@@ static int do_ioctl(struct file *f, unsi
 {
 	int ret;
 	lock_kernel();
-	ret = cciss_ioctl(f->f_dentry->d_inode, f, cmd, arg);
+	ret = cciss_ioctl(f->f_path.dentry->d_inode, f, cmd, arg);
 	unlock_kernel();
 	return ret;
 }
diff -r ed8030e0f7d4 drivers/block/loop.c
--- a/drivers/block/loop.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/block/loop.c	Mon Oct 23 23:25:36 2006 -0400
@@@@ -1000,7 +1000,7 @@@@ loop_get_status(struct loop_device *lo, 
 
 	if (lo->lo_state != Lo_bound)
 		return -ENXIO;
-	error = vfs_getattr(file->f_vfsmnt, file->f_dentry, &stat);
+	error = vfs_getattr(file->f_path.mnt, file->f_path.dentry, &stat);
 	if (error)
 		return error;
 	memset(info, 0, sizeof(*info));
@@@@ -1287,7 +1287,7 @@@@ loop_get_status_compat(struct loop_devic
 
 static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct inode *inode = file->f_dentry->d_inode;
+	struct inode *inode = file->f_path.dentry->d_inode;
 	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
 	int err;
 
diff -r ed8030e0f7d4 drivers/block/nbd.c
--- a/drivers/block/nbd.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/block/nbd.c	Mon Oct 23 23:25:36 2006 -0400
@@@@ -521,7 +521,7 @@@@ static int nbd_ioctl(struct inode *inode
 		error = -EINVAL;
 		file = fget(arg);
 		if (file) {
-			inode = file->f_dentry->d_inode;
+			inode = file->f_path.dentry->d_inode;
 			if (S_ISSOCK(inode->i_mode)) {
 				lo->file = file;
 				lo->sock = SOCKET_I(inode);

@


1.1.2.2
log
@reorder, rename and add descriptions to the remainder of f_{dentry,vfsmnt}
patches
@
text
@a0 8
block drivers: 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 block drivers.

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

d55 12
@


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
@@


