aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext3/dir.c8
-rw-r--r--fs/ext3/file.c2
-rw-r--r--fs/ext3/ioctl.c2
-rw-r--r--fs/ext3/namei.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 5a9313ecd4ef..665adee99b31 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -103,7 +103,7 @@ static int ext3_readdir(struct file * filp,
103 struct ext3_dir_entry_2 *de; 103 struct ext3_dir_entry_2 *de;
104 struct super_block *sb; 104 struct super_block *sb;
105 int err; 105 int err;
106 struct inode *inode = filp->f_dentry->d_inode; 106 struct inode *inode = filp->f_path.dentry->d_inode;
107 int ret = 0; 107 int ret = 0;
108 108
109 sb = inode->i_sb; 109 sb = inode->i_sb;
@@ -122,7 +122,7 @@ static int ext3_readdir(struct file * filp,
122 * We don't set the inode dirty flag since it's not 122 * We don't set the inode dirty flag since it's not
123 * critical that it get flushed back to the disk. 123 * critical that it get flushed back to the disk.
124 */ 124 */
125 EXT3_I(filp->f_dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL; 125 EXT3_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL;
126 } 126 }
127#endif 127#endif
128 stored = 0; 128 stored = 0;
@@ -402,7 +402,7 @@ static int call_filldir(struct file * filp, void * dirent,
402{ 402{
403 struct dir_private_info *info = filp->private_data; 403 struct dir_private_info *info = filp->private_data;
404 loff_t curr_pos; 404 loff_t curr_pos;
405 struct inode *inode = filp->f_dentry->d_inode; 405 struct inode *inode = filp->f_path.dentry->d_inode;
406 struct super_block * sb; 406 struct super_block * sb;
407 int error; 407 int error;
408 408
@@ -432,7 +432,7 @@ static int ext3_dx_readdir(struct file * filp,
432 void * dirent, filldir_t filldir) 432 void * dirent, filldir_t filldir)
433{ 433{
434 struct dir_private_info *info = filp->private_data; 434 struct dir_private_info *info = filp->private_data;
435 struct inode *inode = filp->f_dentry->d_inode; 435 struct inode *inode = filp->f_path.dentry->d_inode;
436 struct fname *fname; 436 struct fname *fname;
437 int ret; 437 int ret;
438 438
diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index e96c388047e0..881f6365c41a 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -52,7 +52,7 @@ ext3_file_write(struct kiocb *iocb, const struct iovec *iov,
52 unsigned long nr_segs, loff_t pos) 52 unsigned long nr_segs, loff_t pos)
53{ 53{
54 struct file *file = iocb->ki_filp; 54 struct file *file = iocb->ki_filp;
55 struct inode *inode = file->f_dentry->d_inode; 55 struct inode *inode = file->f_path.dentry->d_inode;
56 ssize_t ret; 56 ssize_t ret;
57 int err; 57 int err;
58 58
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 12daa6869572..9b8090d94e6c 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -257,7 +257,7 @@ flags_err:
257#ifdef CONFIG_COMPAT 257#ifdef CONFIG_COMPAT
258long ext3_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 258long ext3_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
259{ 259{
260 struct inode *inode = file->f_dentry->d_inode; 260 struct inode *inode = file->f_path.dentry->d_inode;
261 int ret; 261 int ret;
262 262
263 /* These are just misnamed, they actually get/put from/to user an int */ 263 /* These are just misnamed, they actually get/put from/to user an int */
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 60d2f9dbdb00..4df39c4315e1 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -602,7 +602,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
602 602
603 dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash, 603 dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash,
604 start_minor_hash)); 604 start_minor_hash));
605 dir = dir_file->f_dentry->d_inode; 605 dir = dir_file->f_path.dentry->d_inode;
606 if (!(EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) { 606 if (!(EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) {
607 hinfo.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version; 607 hinfo.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version;
608 hinfo.seed = EXT3_SB(dir->i_sb)->s_hash_seed; 608 hinfo.seed = EXT3_SB(dir->i_sb)->s_hash_seed;
@@ -613,7 +613,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
613 } 613 }
614 hinfo.hash = start_hash; 614 hinfo.hash = start_hash;
615 hinfo.minor_hash = 0; 615 hinfo.minor_hash = 0;
616 frame = dx_probe(NULL, dir_file->f_dentry->d_inode, &hinfo, frames, &err); 616 frame = dx_probe(NULL, dir_file->f_path.dentry->d_inode, &hinfo, frames, &err);
617 if (!frame) 617 if (!frame)
618 return err; 618 return err;
619 619