diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /fs/ext4/inode.c | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cbfe13bf5b2a..521bd4ab8abe 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2959,7 +2959,7 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset, | |||
2959 | ssize_t size, void *private, int ret, | 2959 | ssize_t size, void *private, int ret, |
2960 | bool is_async) | 2960 | bool is_async) |
2961 | { | 2961 | { |
2962 | struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; | 2962 | struct inode *inode = file_inode(iocb->ki_filp); |
2963 | ext4_io_end_t *io_end = iocb->private; | 2963 | ext4_io_end_t *io_end = iocb->private; |
2964 | 2964 | ||
2965 | /* if not async direct IO or dio with 0 bytes write, just return */ | 2965 | /* if not async direct IO or dio with 0 bytes write, just return */ |
@@ -3553,7 +3553,7 @@ int ext4_can_truncate(struct inode *inode) | |||
3553 | 3553 | ||
3554 | int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) | 3554 | int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) |
3555 | { | 3555 | { |
3556 | struct inode *inode = file->f_path.dentry->d_inode; | 3556 | struct inode *inode = file_inode(file); |
3557 | if (!S_ISREG(inode->i_mode)) | 3557 | if (!S_ISREG(inode->i_mode)) |
3558 | return -EOPNOTSUPP; | 3558 | return -EOPNOTSUPP; |
3559 | 3559 | ||
@@ -4926,7 +4926,7 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
4926 | unsigned long len; | 4926 | unsigned long len; |
4927 | int ret; | 4927 | int ret; |
4928 | struct file *file = vma->vm_file; | 4928 | struct file *file = vma->vm_file; |
4929 | struct inode *inode = file->f_path.dentry->d_inode; | 4929 | struct inode *inode = file_inode(file); |
4930 | struct address_space *mapping = inode->i_mapping; | 4930 | struct address_space *mapping = inode->i_mapping; |
4931 | handle_t *handle; | 4931 | handle_t *handle; |
4932 | get_block_t *get_block; | 4932 | get_block_t *get_block; |