ufs_trunc_dindirect(): pass the number of blocks to keep (7bad5939) · Commits · e / devices / android_kernel_teracube_emerald

fs/ufs/inode.c

+26 −31

Original line number	Original line	Diff line number	Diff line
	@@ -1136,25 +1136,15 @@ static void ufs_trunc_indirect(struct inode inode, unsigned from, void p)

	static void ufs_trunc_dindirect(struct inode inode, u64 offset, void p)		static void ufs_trunc_dindirect(struct inode inode, u64 offset, void p)
	{		{
	struct super_block * sb;		struct super_block *sb = inode->i_sb;
	struct ufs_sb_private_info * uspi;		struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
	struct ufs_buffer_head *dind_bh;		struct ufs_buffer_head *dind_bh;
	u64 i, tmp, dindirect_block;		u64 tmp;
	void *dind;		void *dind;
	unsigned from;		bool free_it = !offset;
			unsigned dindirect_block = offset >> uspi->s_apbshift;
	UFSD("ENTER: ino %lu\n", inode->i_ino);		unsigned from = offset & uspi->s_apbmask;
			unsigned i;
	sb = inode->i_sb;
	uspi = UFS_SB(sb)->s_uspi;

	if (DIRECT_BLOCK <= offset) {
	dindirect_block = 0;
	from = 0;
	} else {
	dindirect_block = (DIRECT_BLOCK - offset) >> uspi->s_apbshift;
	from = (DIRECT_BLOCK - offset) & uspi->s_apbmask;
	}

	tmp = ufs_data_ptr_to_cpu(sb, p);		tmp = ufs_data_ptr_to_cpu(sb, p);
	if (!tmp)		if (!tmp)
	@@ -1176,11 +1166,7 @@ static void ufs_trunc_dindirect(struct inode inode, u64 offset, void p)
	ubh_mark_buffer_dirty(dind_bh);		ubh_mark_buffer_dirty(dind_bh);
	}		}

	for (i = 0; i < uspi->s_apb; i++)		if (free_it) {
	if (!ufs_is_data_ptr_zero(uspi,
	ubh_get_data_ptr(uspi, dind_bh, i)))
	break;
	if (i >= uspi->s_apb) {
	tmp = ufs_data_ptr_to_cpu(sb, p);		tmp = ufs_data_ptr_to_cpu(sb, p);
	write_seqlock(&UFS_I(inode)->meta_lock);		write_seqlock(&UFS_I(inode)->meta_lock);
	ufs_data_ptr_clear(uspi, p);		ufs_data_ptr_clear(uspi, p);
	@@ -1189,13 +1175,11 @@ static void ufs_trunc_dindirect(struct inode inode, u64 offset, void p)
	ubh_bforget(dind_bh);		ubh_bforget(dind_bh);
	ufs_free_blocks(inode, tmp, uspi->s_fpb);		ufs_free_blocks(inode, tmp, uspi->s_fpb);
	mark_inode_dirty(inode);		mark_inode_dirty(inode);
	dind_bh = NULL;		return;
	}		}
	if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh))		if (IS_SYNC(inode) && ubh_buffer_dirty(dind_bh))
	ubh_sync_block(dind_bh);		ubh_sync_block(dind_bh);
	ubh_brelse (dind_bh);		ubh_brelse (dind_bh);

	UFSD("EXIT: ino %lu\n", inode->i_ino);
	}		}

	static void ufs_trunc_tindirect(struct inode *inode, u64 offset)		static void ufs_trunc_tindirect(struct inode *inode, u64 offset)
	@@ -1210,6 +1194,8 @@ static void ufs_trunc_tindirect(struct inode *inode, u64 offset)
	unsigned tindirect_block = offset >> uspi->s_2apbshift;		unsigned tindirect_block = offset >> uspi->s_2apbshift;
	unsigned i;		unsigned i;

			offset -= tindirect_block << uspi->s_2apbshift;

	p = ufs_get_direct_data_ptr(uspi, ufsi, UFS_TIND_BLOCK);		p = ufs_get_direct_data_ptr(uspi, ufsi, UFS_TIND_BLOCK);
	if (!(tmp = ufs_data_ptr_to_cpu(sb, p)))		if (!(tmp = ufs_data_ptr_to_cpu(sb, p)))
	return;		return;
	@@ -1221,10 +1207,9 @@ static void ufs_trunc_tindirect(struct inode *inode, u64 offset)
	return;		return;
	}		}

	for (i = tindirect_block ; i < uspi->s_apb ; i++) {		for (i = tindirect_block ; i < uspi->s_apb ; i++, offset = 0) {
	tind = ubh_get_data_ptr(uspi, tind_bh, i);		tind = ubh_get_data_ptr(uspi, tind_bh, i);
	ufs_trunc_dindirect(inode, UFS_NDADDR +		ufs_trunc_dindirect(inode, offset, tind);
	uspi->s_apb + ((i + 1) << uspi->s_2apbshift), tind);
	ubh_mark_buffer_dirty(tind_bh);		ubh_mark_buffer_dirty(tind_bh);
	}		}
	if (free_it) {		if (free_it) {
	@@ -1318,18 +1303,28 @@ static void __ufs_truncate_blocks(struct inode *inode)
	struct ufs_inode_info *ufsi = UFS_I(inode);		struct ufs_inode_info *ufsi = UFS_I(inode);
	struct super_block *sb = inode->i_sb;		struct super_block *sb = inode->i_sb;
	struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;		struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
	unsigned offsets[4] = {0,};		unsigned offsets[4];
	int depth = ufs_block_to_path(inode, DIRECT_BLOCK, offsets);		int depth = ufs_block_to_path(inode, DIRECT_BLOCK, offsets);

	mutex_lock(&ufsi->truncate_mutex);		mutex_lock(&ufsi->truncate_mutex);
	switch (depth) {		switch (depth) {
	case 1:		case 1:
	ufs_trunc_direct(inode);		ufs_trunc_direct(inode);
			ufs_trunc_indirect(inode, 0,
			ufs_get_direct_data_ptr(uspi, ufsi, UFS_IND_BLOCK));
			ufs_trunc_dindirect(inode, 0,
			ufs_get_direct_data_ptr(uspi, ufsi, UFS_DIND_BLOCK));
			ufs_trunc_tindirect(inode, 0);
			break;
	case 2:		case 2:
	ufs_trunc_indirect(inode, offsets[1],		ufs_trunc_indirect(inode, offsets[1],
	ufs_get_direct_data_ptr(uspi, ufsi, UFS_IND_BLOCK));		ufs_get_direct_data_ptr(uspi, ufsi, UFS_IND_BLOCK));
			ufs_trunc_dindirect(inode, 0,
			ufs_get_direct_data_ptr(uspi, ufsi, UFS_DIND_BLOCK));
			ufs_trunc_tindirect(inode, 0);
			break;
	case 3:		case 3:
	ufs_trunc_dindirect(inode, UFS_IND_BLOCK + uspi->s_apb,		ufs_trunc_dindirect(inode, DIRECT_BLOCK - UFS_IND_BLOCK - uspi->s_apb,
	ufs_get_direct_data_ptr(uspi, ufsi, UFS_DIND_BLOCK));		ufs_get_direct_data_ptr(uspi, ufsi, UFS_DIND_BLOCK));
	ufs_trunc_tindirect(inode, 0);		ufs_trunc_tindirect(inode, 0);
	break;		break;