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


1.1.2.1
log
@Got few more patches into -mm
@
text
@a0 82
md: 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 md code.

Cc: mingo@@redhat.com
Cc: dm-devel@@redhat.com
Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

diff -r ed8030e0f7d4 drivers/md/bitmap.c
--- a/drivers/md/bitmap.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/md/bitmap.c	Mon Oct 23 23:25:52 2006 -0400
@@@@ -212,8 +212,8 @@@@ char *file_path(struct file *file, char 
 	if (!buf)
 		return NULL;
 
-	d = file->f_dentry;
-	v = file->f_vfsmnt;
+	d = file->f_path.dentry;
+	v = file->f_path.mnt;
 
 	buf = d_path(d, v, buf, count);
 
@@@@ -349,7 +349,7 @@@@ static struct page *read_page(struct fil
 			      unsigned long count)
 {
 	struct page *page = NULL;
-	struct inode *inode = file->f_dentry->d_inode;
+	struct inode *inode = file->f_path.dentry->d_inode;
 	struct buffer_head *bh;
 	sector_t block;
 
@@@@ -662,7 +662,7 @@@@ static void bitmap_file_put(struct bitma
 	bitmap_file_unmap(bitmap);
 
 	if (file) {
-		struct inode *inode = file->f_dentry->d_inode;
+		struct inode *inode = file->f_path.dentry->d_inode;
 		invalidate_inode_pages(inode->i_mapping);
 		fput(file);
 	}
diff -r ed8030e0f7d4 drivers/md/dm-linear.c
--- a/drivers/md/dm-linear.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/md/dm-linear.c	Mon Oct 23 23:25:52 2006 -0400
@@@@ -108,7 +108,7 @@@@ static int linear_ioctl(struct dm_target
 	struct dentry fake_dentry = {};
 
 	fake_file.f_mode = lc->dev->mode;
-	fake_file.f_dentry = &fake_dentry;
+	fake_file.f_path.dentry = &fake_dentry;
 	fake_dentry.d_inode = bdev->bd_inode;
 
 	return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);
diff -r ed8030e0f7d4 drivers/md/dm-mpath.c
--- a/drivers/md/dm-mpath.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/md/dm-mpath.c	Mon Oct 23 23:25:52 2006 -0400
@@@@ -1270,7 +1270,7 @@@@ static int multipath_ioctl(struct dm_tar
 	struct dentry fake_dentry = {};
 	int r = 0;
 
-	fake_file.f_dentry = &fake_dentry;
+	fake_file.f_path.dentry = &fake_dentry;
 
 	spin_lock_irqsave(&m->lock, flags);
 
diff -r ed8030e0f7d4 drivers/md/md.c
--- a/drivers/md/md.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/md/md.c	Mon Oct 23 23:25:52 2006 -0400
@@@@ -4847,8 +4847,8 @@@@ static int md_seq_show(struct seq_file *
 				chunk_kb ? "KB" : "B");
 			if (bitmap->file) {
 				seq_printf(seq, ", file: ");
-				seq_path(seq, bitmap->file->f_vfsmnt,
-					 bitmap->file->f_dentry," \t\n");
+				seq_path(seq, bitmap->file->f_path.mnt,
+					 bitmap->file->f_path.dentry," \t\n");
 			}
 
 			seq_printf(seq, "\n");

@


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


