diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/dir.c | 8 | ||||
-rw-r--r-- | fs/ext4/file.c | 2 | ||||
-rw-r--r-- | fs/ext4/ioctl.c | 2 | ||||
-rw-r--r-- | fs/ext4/namei.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index f2ed3e7fb9f5..da80368b66f0 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c | |||
@@ -103,7 +103,7 @@ static int ext4_readdir(struct file * filp, | |||
103 | struct ext4_dir_entry_2 *de; | 103 | struct ext4_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 ext4_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 | EXT4_I(filp->f_dentry->d_inode)->i_flags &= ~EXT4_INDEX_FL; | 125 | EXT4_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT4_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 ext4_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/ext4/file.c b/fs/ext4/file.c index 0b622c0624b7..3bbc24b58785 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -52,7 +52,7 @@ ext4_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/ext4/ioctl.c b/fs/ext4/ioctl.c index 22a737c306c7..500567dd53b6 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -256,7 +256,7 @@ flags_err: | |||
256 | #ifdef CONFIG_COMPAT | 256 | #ifdef CONFIG_COMPAT |
257 | long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 257 | long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
258 | { | 258 | { |
259 | struct inode *inode = file->f_dentry->d_inode; | 259 | struct inode *inode = file->f_path.dentry->d_inode; |
260 | int ret; | 260 | int ret; |
261 | 261 | ||
262 | /* These are just misnamed, they actually get/put from/to user an int */ | 262 | /* These are just misnamed, they actually get/put from/to user an int */ |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 859990eac504..e5a74a5ac261 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -602,7 +602,7 @@ int ext4_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 (!(EXT4_I(dir)->i_flags & EXT4_INDEX_FL)) { | 606 | if (!(EXT4_I(dir)->i_flags & EXT4_INDEX_FL)) { |
607 | hinfo.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; | 607 | hinfo.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; |
608 | hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed; | 608 | hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed; |
@@ -613,7 +613,7 @@ int ext4_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 | ||