diff options
| -rw-r--r-- | fs/orangefs/file.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 66ea0cc37b18..02cc6139ec90 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c | |||
| @@ -621,9 +621,9 @@ static int orangefs_file_release(struct inode *inode, struct file *file) | |||
| 621 | * readahead cache (if any); this forces an expensive refresh of | 621 | * readahead cache (if any); this forces an expensive refresh of |
| 622 | * data for the next caller of mmap (or 'get_block' accesses) | 622 | * data for the next caller of mmap (or 'get_block' accesses) |
| 623 | */ | 623 | */ |
| 624 | if (file->f_path.dentry->d_inode && | 624 | if (file_inode(file) && |
| 625 | file->f_path.dentry->d_inode->i_mapping && | 625 | file_inode(file)->i_mapping && |
| 626 | mapping_nrpages(&file->f_path.dentry->d_inode->i_data)) { | 626 | mapping_nrpages(&file_inode(file)->i_data)) { |
| 627 | if (orangefs_features & ORANGEFS_FEATURE_READAHEAD) { | 627 | if (orangefs_features & ORANGEFS_FEATURE_READAHEAD) { |
| 628 | gossip_debug(GOSSIP_INODE_DEBUG, | 628 | gossip_debug(GOSSIP_INODE_DEBUG, |
| 629 | "calling flush_racache on %pU\n", | 629 | "calling flush_racache on %pU\n", |
| @@ -632,7 +632,7 @@ static int orangefs_file_release(struct inode *inode, struct file *file) | |||
| 632 | gossip_debug(GOSSIP_INODE_DEBUG, | 632 | gossip_debug(GOSSIP_INODE_DEBUG, |
| 633 | "flush_racache finished\n"); | 633 | "flush_racache finished\n"); |
| 634 | } | 634 | } |
| 635 | truncate_inode_pages(file->f_path.dentry->d_inode->i_mapping, | 635 | truncate_inode_pages(file_inode(file)->i_mapping, |
| 636 | 0); | 636 | 0); |
| 637 | } | 637 | } |
| 638 | return 0; | 638 | return 0; |
| @@ -648,7 +648,7 @@ static int orangefs_fsync(struct file *file, | |||
| 648 | { | 648 | { |
| 649 | int ret = -EINVAL; | 649 | int ret = -EINVAL; |
| 650 | struct orangefs_inode_s *orangefs_inode = | 650 | struct orangefs_inode_s *orangefs_inode = |
| 651 | ORANGEFS_I(file->f_path.dentry->d_inode); | 651 | ORANGEFS_I(file_inode(file)); |
| 652 | struct orangefs_kernel_op_s *new_op = NULL; | 652 | struct orangefs_kernel_op_s *new_op = NULL; |
| 653 | 653 | ||
| 654 | /* required call */ | 654 | /* required call */ |
| @@ -661,7 +661,7 @@ static int orangefs_fsync(struct file *file, | |||
| 661 | 661 | ||
| 662 | ret = service_operation(new_op, | 662 | ret = service_operation(new_op, |
| 663 | "orangefs_fsync", | 663 | "orangefs_fsync", |
| 664 | get_interruptible_flag(file->f_path.dentry->d_inode)); | 664 | get_interruptible_flag(file_inode(file))); |
| 665 | 665 | ||
| 666 | gossip_debug(GOSSIP_FILE_DEBUG, | 666 | gossip_debug(GOSSIP_FILE_DEBUG, |
| 667 | "orangefs_fsync got return value of %d\n", | 667 | "orangefs_fsync got return value of %d\n", |
| @@ -669,7 +669,7 @@ static int orangefs_fsync(struct file *file, | |||
| 669 | 669 | ||
| 670 | op_release(new_op); | 670 | op_release(new_op); |
| 671 | 671 | ||
| 672 | orangefs_flush_inode(file->f_path.dentry->d_inode); | 672 | orangefs_flush_inode(file_inode(file)); |
| 673 | return ret; | 673 | return ret; |
| 674 | } | 674 | } |
| 675 | 675 | ||
