summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Sangwan <a.sangwan@samsung.com>2013-07-01 12:12:38 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2013-07-01 12:12:38 (GMT)
commitaeb2817a4ea99f62532adf3377be3b282d3bda12 (patch)
tree7e51c67923215eb8e6596d2052d2b8ad261c1b3c
parentc4932dbe63dae2d23b4f596caa5d286ebfe042cf (diff)
downloadlinux-aeb2817a4ea99f62532adf3377be3b282d3bda12.tar.xz
ext4: pass inode pointer instead of file pointer to punch hole
No need to pass file pointer when we can directly pass inode pointer. Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/ext4.h2
-rw-r--r--fs/ext4/extents.c2
-rw-r--r--fs/ext4/inode.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 7cc6b18..6ed348d 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2088,7 +2088,7 @@ extern int ext4_change_inode_journal_flag(struct inode *, int);
extern int ext4_get_inode_loc(struct inode *, struct ext4_iloc *);
extern int ext4_can_truncate(struct inode *inode);
extern void ext4_truncate(struct inode *);
-extern int ext4_punch_hole(struct file *file, loff_t offset, loff_t length);
+extern int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length);
extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks);
extern void ext4_set_inode_flags(struct inode *);
extern void ext4_get_inode_flags(struct ext4_inode_info *);
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 51e4168..937593e 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4463,7 +4463,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
return -EOPNOTSUPP;
if (mode & FALLOC_FL_PUNCH_HOLE)
- return ext4_punch_hole(file, offset, len);
+ return ext4_punch_hole(inode, offset, len);
ret = ext4_convert_inline_data(inode);
if (ret)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index f9ba51f..753c156 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3481,9 +3481,8 @@ int ext4_can_truncate(struct inode *inode)
* Returns: 0 on success or negative on failure
*/
-int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
+int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
{
- struct inode *inode = file_inode(file);
struct super_block *sb = inode->i_sb;
ext4_lblk_t first_block, stop_block;
struct address_space *mapping = inode->i_mapping;