Commit ff9893dc authored by Amir Goldstein's avatar Amir Goldstein Committed by Theodore Ts'o
Browse files

ext4: split ext4_ind_truncate from ext4_truncate 



We are about to move all indirect inode functions to a new file.
Before we do that, let's split ext4_ind_truncate() out of ext4_truncate()
leaving only generic code in the latter, so we will be able to move
ext4_ind_truncate() to the new file.

Signed-off-by: default avatarAmir Goldstein <amir73il@users.sf.net>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent ed7a7e16

fs/ext4/ext4.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1834,6 +1834,8 @@ extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf); 
extern qsize_t *ext4_get_reserved_space(struct inode *inode);

extern qsize_t *ext4_get_reserved_space(struct inode *inode);

extern void ext4_da_update_reserve_space(struct inode *inode,

extern void ext4_da_update_reserve_space(struct inode *inode,

					int used, int quota_claim);

					int used, int quota_claim);

extern void ext4_ind_truncate(struct inode *inode);



/* ioctl.c */

/* ioctl.c */

extern long ext4_ioctl(struct file *, unsigned int, unsigned long);

extern long ext4_ioctl(struct file *, unsigned int, unsigned long);

extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);

extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);

fs/ext4/inode.c

+20 −16
Original line number Original line Diff line number Diff line
@@ -4471,19 +4471,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) 
 */

 */

void ext4_truncate(struct inode *inode)

void ext4_truncate(struct inode *inode)

{

{

	handle_t *handle;

	struct ext4_inode_info *ei = EXT4_I(inode);

	__le32 *i_data = ei->i_data;

	int addr_per_block = EXT4_ADDR_PER_BLOCK(inode->i_sb);

	struct address_space *mapping = inode->i_mapping;

	ext4_lblk_t offsets[4];

	Indirect chain[4];

	Indirect *partial;

	__le32 nr = 0;

	int n = 0;

	ext4_lblk_t last_block, max_block;

	unsigned blocksize = inode->i_sb->s_blocksize;



	trace_ext4_truncate_enter(inode);

	trace_ext4_truncate_enter(inode);





	if (!ext4_can_truncate(inode))

	if (!ext4_can_truncate(inode))
@@ -4494,12 +4481,29 @@ void ext4_truncate(struct inode *inode) 
	if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))

	if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))

		ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);

		ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);





	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {

	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))

		ext4_ext_truncate(inode);

		ext4_ext_truncate(inode);

	else

		ext4_ind_truncate(inode);



	trace_ext4_truncate_exit(inode);

	trace_ext4_truncate_exit(inode);

		return;

}

}





void ext4_ind_truncate(struct inode *inode)

{

	handle_t *handle;

	struct ext4_inode_info *ei = EXT4_I(inode);

	__le32 *i_data = ei->i_data;

	int addr_per_block = EXT4_ADDR_PER_BLOCK(inode->i_sb);

	struct address_space *mapping = inode->i_mapping;

	ext4_lblk_t offsets[4];

	Indirect chain[4];

	Indirect *partial;

	__le32 nr = 0;

	int n = 0;

	ext4_lblk_t last_block, max_block;

	unsigned blocksize = inode->i_sb->s_blocksize;



	handle = start_transaction(inode);

	handle = start_transaction(inode);

	if (IS_ERR(handle))

	if (IS_ERR(handle))

		return;		/* AKPM: return what? */

		return;		/* AKPM: return what? */

CRA Git | Maintained and supported by SUSTech CRA and CCSE