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

Commit 74380c47 authored by Tao Ma's avatar Tao Ma
Browse files

ocfs2: Free block to the right block group. 



In case the block we are going to free is allocated from
a discontiguous block group, we have to use suballoc_loc
to be the right group.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
parent af2bf0d8

fs/ocfs2/alloc.c

+12 −6
Original line number Diff line number Diff line
@@ -6203,6 +6203,7 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb) 
 */

struct ocfs2_cached_block_free {

	struct ocfs2_cached_block_free		*free_next;

	u64					free_bg;

	u64					free_blk;

	unsigned int				free_bit;

};
@@ -6249,6 +6250,9 @@ static int ocfs2_free_cached_blocks(struct ocfs2_super *osb, 
	}



	while (head) {

		if (head->free_bg)

			bg_blkno = head->free_bg;

		else

			bg_blkno = ocfs2_which_suballoc_group(head->free_blk,

							      head->free_bit);

		mlog(0, "Free bit: (bit %u, blkno %llu)\n",
@@ -6298,7 +6302,7 @@ int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, 
	int ret = 0;

	struct ocfs2_cached_block_free *item;



	item = kmalloc(sizeof(*item), GFP_NOFS);

	item = kzalloc(sizeof(*item), GFP_NOFS);

	if (item == NULL) {

		ret = -ENOMEM;

		mlog_errno(ret);
@@ -6438,8 +6442,8 @@ ocfs2_find_per_slot_free_list(int type, 
}



int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,

			      int type, int slot, u64 blkno,

			      unsigned int bit)

			      int type, int slot, u64 suballoc,

			      u64 blkno, unsigned int bit)

{

	int ret;

	struct ocfs2_per_slot_free_list *fl;
@@ -6452,7 +6456,7 @@ int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, 
		goto out;

	}



	item = kmalloc(sizeof(*item), GFP_NOFS);

	item = kzalloc(sizeof(*item), GFP_NOFS);

	if (item == NULL) {

		ret = -ENOMEM;

		mlog_errno(ret);
@@ -6462,6 +6466,7 @@ int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, 
	mlog(0, "Insert: (type %d, slot %u, bit %u, blk %llu)\n",

	     type, slot, bit, (unsigned long long)blkno);



	item->free_bg = suballoc;

	item->free_blk = blkno;

	item->free_bit = bit;

	item->free_next = fl->f_first;
@@ -6478,6 +6483,7 @@ static int ocfs2_cache_extent_block_free(struct ocfs2_cached_dealloc_ctxt *ctxt, 
{

	return ocfs2_cache_block_dealloc(ctxt, EXTENT_ALLOC_SYSTEM_INODE,

					 le16_to_cpu(eb->h_suballoc_slot),

					 le64_to_cpu(eb->h_suballoc_loc),

					 le64_to_cpu(eb->h_blkno),

					 le16_to_cpu(eb->h_suballoc_bit));

}

fs/ocfs2/alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static inline void ocfs2_init_dealloc_ctxt(struct ocfs2_cached_dealloc_ctxt *c) 
int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,

				u64 blkno, unsigned int bit);

int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,

			      int type, int slot, u64 blkno,

			      int type, int slot, u64 suballoc, u64 blkno,

			      unsigned int bit);

static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c)

{

fs/ocfs2/dir.c

+4 −1
Original line number Diff line number Diff line
@@ -4466,6 +4466,9 @@ static int ocfs2_dx_dir_remove_index(struct inode *dir, 


	blk = le64_to_cpu(dx_root->dr_blkno);

	bit = le16_to_cpu(dx_root->dr_suballoc_bit);

	if (dx_root->dr_suballoc_loc)

		bg_blkno = le64_to_cpu(dx_root->dr_suballoc_loc);

	else

		bg_blkno = ocfs2_which_suballoc_group(blk, bit);

	ret = ocfs2_free_suballoc_bits(handle, dx_alloc_inode, dx_alloc_bh,

				       bit, bg_blkno, 1);

fs/ocfs2/refcounttree.c

+5 −1
Original line number Diff line number Diff line
@@ -792,6 +792,9 @@ int ocfs2_remove_refcount_tree(struct inode *inode, struct buffer_head *di_bh) 
	if (le32_to_cpu(rb->rf_count) == 1) {

		blk = le64_to_cpu(rb->rf_blkno);

		bit = le16_to_cpu(rb->rf_suballoc_bit);

		if (rb->rf_suballoc_loc)

			bg_blkno = le64_to_cpu(rb->rf_suballoc_loc);

		else

			bg_blkno = ocfs2_which_suballoc_group(blk, bit);



		alloc_inode = ocfs2_get_system_file_inode(osb,
@@ -2108,6 +2111,7 @@ static int ocfs2_remove_refcount_extent(handle_t *handle, 
	 */

	ret = ocfs2_cache_block_dealloc(dealloc, EXTENT_ALLOC_SYSTEM_INODE,

					le16_to_cpu(rb->rf_suballoc_slot),

					le64_to_cpu(rb->rf_suballoc_loc),

					le64_to_cpu(rb->rf_blkno),

					le16_to_cpu(rb->rf_suballoc_bit));

	if (ret) {

fs/ocfs2/suballoc.c

+2 −0
Original line number Diff line number Diff line
@@ -2349,6 +2349,8 @@ int ocfs2_free_dinode(handle_t *handle, 
	u16 bit = le16_to_cpu(di->i_suballoc_bit);

	u64 bg_blkno = ocfs2_which_suballoc_group(blk, bit);



	if (di->i_suballoc_loc)

		bg_blkno = le64_to_cpu(di->i_suballoc_loc);

	return ocfs2_free_suballoc_bits(handle, inode_alloc_inode,

					inode_alloc_bh, bit, bg_blkno, 1);

}