aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:19 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:47 -0500
commitc649bb9c55e78dcff0e1383c13d91e0bfc2abb4a (patch)
tree2db97a161e909c22840d72ac15704b56b09a9094
parent225a719f79fbc4d0cd9d9ebc5b2e3ac0e95845aa (diff)
[PATCH] struct path: convert md
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/bitmap.c8
-rw-r--r--drivers/md/dm-linear.c2
-rw-r--r--drivers/md/dm-mpath.c2
-rw-r--r--drivers/md/md.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index d6f614738bbd..5432d07c074d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -212,8 +212,8 @@ char *file_path(struct file *file, char *buf, int count)
212 if (!buf) 212 if (!buf)
213 return NULL; 213 return NULL;
214 214
215 d = file->f_dentry; 215 d = file->f_path.dentry;
216 v = file->f_vfsmnt; 216 v = file->f_path.mnt;
217 217
218 buf = d_path(d, v, buf, count); 218 buf = d_path(d, v, buf, count);
219 219
@@ -349,7 +349,7 @@ static struct page *read_page(struct file *file, unsigned long index,
349 unsigned long count) 349 unsigned long count)
350{ 350{
351 struct page *page = NULL; 351 struct page *page = NULL;
352 struct inode *inode = file->f_dentry->d_inode; 352 struct inode *inode = file->f_path.dentry->d_inode;
353 struct buffer_head *bh; 353 struct buffer_head *bh;
354 sector_t block; 354 sector_t block;
355 355
@@ -662,7 +662,7 @@ static void bitmap_file_put(struct bitmap *bitmap)
662 bitmap_file_unmap(bitmap); 662 bitmap_file_unmap(bitmap);
663 663
664 if (file) { 664 if (file) {
665 struct inode *inode = file->f_dentry->d_inode; 665 struct inode *inode = file->f_path.dentry->d_inode;
666 invalidate_inode_pages(inode->i_mapping); 666 invalidate_inode_pages(inode->i_mapping);
667 fput(file); 667 fput(file);
668 } 668 }
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 00234909b3db..4a1cee48e652 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -108,7 +108,7 @@ static int linear_ioctl(struct dm_target *ti, struct inode *inode,
108 struct dentry fake_dentry = {}; 108 struct dentry fake_dentry = {};
109 109
110 fake_file.f_mode = lc->dev->mode; 110 fake_file.f_mode = lc->dev->mode;
111 fake_file.f_dentry = &fake_dentry; 111 fake_file.f_path.dentry = &fake_dentry;
112 fake_dentry.d_inode = bdev->bd_inode; 112 fake_dentry.d_inode = bdev->bd_inode;
113 113
114 return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg); 114 return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index e9dfe2c98059..dda4109292bc 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1272,7 +1272,7 @@ static int multipath_ioctl(struct dm_target *ti, struct inode *inode,
1272 struct dentry fake_dentry = {}; 1272 struct dentry fake_dentry = {};
1273 int r = 0; 1273 int r = 0;
1274 1274
1275 fake_file.f_dentry = &fake_dentry; 1275 fake_file.f_path.dentry = &fake_dentry;
1276 1276
1277 spin_lock_irqsave(&m->lock, flags); 1277 spin_lock_irqsave(&m->lock, flags);
1278 1278
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3ce7a5d81d81..53bd46dba0cb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4846,8 +4846,8 @@ static int md_seq_show(struct seq_file *seq, void *v)
4846 chunk_kb ? "KB" : "B"); 4846 chunk_kb ? "KB" : "B");
4847 if (bitmap->file) { 4847 if (bitmap->file) {
4848 seq_printf(seq, ", file: "); 4848 seq_printf(seq, ", file: ");
4849 seq_path(seq, bitmap->file->f_vfsmnt, 4849 seq_path(seq, bitmap->file->f_path.mnt,
4850 bitmap->file->f_dentry," \t\n"); 4850 bitmap->file->f_path.dentry," \t\n");
4851 } 4851 }
4852 4852
4853 seq_printf(seq, "\n"); 4853 seq_printf(seq, "\n");