aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTao Ma <tao.ma@oracle.com>2008-03-03 04:12:30 -0500
committerMark Fasheh <mfasheh@suse.com>2008-04-18 11:56:10 -0400
commita4a4891164d4f6f383cc17e7c90828a7ca6a1146 (patch)
treea0a881ae3f1910d5f4e4aa9824f93781616ef99f /fs
parentffda89a3bf3b968bdc268584c6bc1da5c173cf12 (diff)
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: Tao Ma <tao.ma@oracle.com> Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/localalloc.c2
-rw-r--r--fs/ocfs2/suballoc.c1
-rw-r--r--fs/ocfs2/suballoc.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index ab83fd562429..b6d07198118c 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -523,6 +523,8 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
523 } 523 }
524 524
525 ac->ac_inode = local_alloc_inode; 525 ac->ac_inode = local_alloc_inode;
526 /* We should never use localalloc from another slot */
527 ac->ac_alloc_slot = osb->slot_num;
526 ac->ac_which = OCFS2_AC_USE_LOCAL; 528 ac->ac_which = OCFS2_AC_USE_LOCAL;
527 get_bh(osb->local_alloc_bh); 529 get_bh(osb->local_alloc_bh);
528 ac->ac_bh = osb->local_alloc_bh; 530 ac->ac_bh = osb->local_alloc_bh;
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 3be4e73e8b13..33d55734c514 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -424,6 +424,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
424 } 424 }
425 425
426 ac->ac_inode = alloc_inode; 426 ac->ac_inode = alloc_inode;
427 ac->ac_alloc_slot = slot;
427 428
428 fe = (struct ocfs2_dinode *) bh->b_data; 429 fe = (struct ocfs2_dinode *) bh->b_data;
429 if (!OCFS2_IS_VALID_DINODE(fe)) { 430 if (!OCFS2_IS_VALID_DINODE(fe)) {
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h
index 8799033bb459..544c600662bd 100644
--- a/fs/ocfs2/suballoc.h
+++ b/fs/ocfs2/suballoc.h
@@ -36,6 +36,7 @@ typedef int (group_search_t)(struct inode *,
36struct ocfs2_alloc_context { 36struct ocfs2_alloc_context {
37 struct inode *ac_inode; /* which bitmap are we allocating from? */ 37 struct inode *ac_inode; /* which bitmap are we allocating from? */
38 struct buffer_head *ac_bh; /* file entry bh */ 38 struct buffer_head *ac_bh; /* file entry bh */
39 u32 ac_alloc_slot; /* which slot are we allocating from? */
39 u32 ac_bits_wanted; 40 u32 ac_bits_wanted;
40 u32 ac_bits_given; 41 u32 ac_bits_given;
41#define OCFS2_AC_USE_LOCAL 1 42#define OCFS2_AC_USE_LOCAL 1