reiserfs: use buffer_info for leaf_paste_entries

This patch makes leaf_paste_entries more consistent with respect to the
other leaf operations.  Using buffer_info instead of buffer_head
directly allows us to get a superblock pointer for use in error
handling.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:18 -04:00 committed by Linus Torvalds
parent 600ed41675
commit eba0030559
3 changed files with 11 additions and 13 deletions

View file

@ -449,8 +449,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
/* when we have merge directory item, pos_in_item has been changed too */
/* paste new directory entry. 1 is entry number */
leaf_paste_entries(bi.
bi_bh,
leaf_paste_entries(&bi,
n +
item_pos
-
@ -699,7 +698,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
n + item_pos -
ret_val);
if (is_direntry_le_ih(pasted))
leaf_paste_entries(bi.bi_bh,
leaf_paste_entries(&bi,
n +
item_pos -
ret_val,
@ -894,8 +893,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
tb->insert_size[0],
body, zeros_num);
/* paste entry */
leaf_paste_entries(bi.
bi_bh,
leaf_paste_entries(&bi,
0,
paste_entry_position,
1,
@ -1096,7 +1094,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
tb->rnum[0]);
if (is_direntry_le_ih(pasted)
&& pos_in_item >= 0) {
leaf_paste_entries(bi.bi_bh,
leaf_paste_entries(&bi,
item_pos -
n +
tb->rnum[0],
@ -1339,8 +1337,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
tb->insert_size[0],
body, zeros_num);
/* paste new directory entry */
leaf_paste_entries(bi.
bi_bh,
leaf_paste_entries(&bi,
0,
pos_in_item
-
@ -1505,7 +1502,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
item_pos - n +
snum[i]);
if (is_direntry_le_ih(pasted)) {
leaf_paste_entries(bi.bi_bh,
leaf_paste_entries(&bi,
item_pos -
n + snum[i],
pos_in_item,
@ -1606,7 +1603,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h
zeros_num);
/* paste entry */
leaf_paste_entries(bi.bi_bh,
leaf_paste_entries(&bi,
item_pos,
pos_in_item,
1,