Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeb2817a authored by Ashish Sangwan's avatar Ashish Sangwan Committed by Theodore Ts'o
Browse files

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: default avatarAshish Sangwan <a.sangwan@samsung.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent c4932dbe

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -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;