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

Commit a4a48911 authored by Tao Ma's avatar Tao Ma Committed by Mark Fasheh
Browse files

ocfs2: Add ac_alloc_slot in ocfs2_alloc_context 



In inode stealing, we no longer restrict the allocation to
happen in the local node. So it is neccessary for us to add
a new member in ocfs2_alloc_context to indicate which slot
we are using for allocation. We also modify the process of
local alloc so that this member can be used there also.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent ffda89a3

fs/ocfs2/localalloc.c

+2 −0
Original line number Diff line number Diff line
@@ -523,6 +523,8 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, 
	}



	ac->ac_inode = local_alloc_inode;

	/* We should never use localalloc from another slot */

	ac->ac_alloc_slot = osb->slot_num;

	ac->ac_which = OCFS2_AC_USE_LOCAL;

	get_bh(osb->local_alloc_bh);

	ac->ac_bh = osb->local_alloc_bh;

fs/ocfs2/suballoc.c

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, 
	}



	ac->ac_inode = alloc_inode;

	ac->ac_alloc_slot = slot;



	fe = (struct ocfs2_dinode *) bh->b_data;

	if (!OCFS2_IS_VALID_DINODE(fe)) {

fs/ocfs2/suballoc.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ typedef int (group_search_t)(struct inode *, 
struct ocfs2_alloc_context {

	struct inode *ac_inode;    /* which bitmap are we allocating from? */

	struct buffer_head *ac_bh; /* file entry bh */

	u32    ac_alloc_slot;   /* which slot are we allocating from? */

	u32    ac_bits_wanted;

	u32    ac_bits_given;

#define OCFS2_AC_USE_LOCAL 1