lgcosta/reiserfsprogs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: factor out buffer_info initialization into helpers

Browse Source 
We open code buffer_info initialization all over the place. Let's
factor that out so we don't reproduce the code everywhere.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
This commit is contained in:
Jeff Mahoney committed 2013-08-26 17:15:33 -04:00
1 parent c1ff1d5d2d
commit 867cfbbb3e
4 files changed
+109 -186
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/reiserfs_fs.h
+53 -1
View File
@@ -1330,12 +1330,12 @@ struct tree_balance {
/* used in do_balance for passing parent of node information that has been
gotten from tb struct */
struct buffer_info {
reiserfs_filsys_t *bi_fs;
struct buffer_head * bi_bh;
struct buffer_head * bi_parent;
int bi_position;
};
/* there are 4 types of items: stat data, directory item, indirect, direct.
FIXME: This table does not describe new key format
+-------------------+------------+--------------+------------+
@@ -1534,6 +1534,58 @@ extern unsigned int get_journal_new_start_must (reiserfs_filsys_t *fs);
extern unsigned int get_journal_start_must (reiserfs_filsys_t *fs);
/*extern hashf_t hashes [];*/
static inline void buffer_info_init_left(struct tree_balance *tb,
struct buffer_info *bi, int h)
{
bi->bi_fs = tb->tb_fs;
bi->bi_bh = tb->L[h];
bi->bi_parent = tb->FL[h];
bi->bi_position = get_left_neighbor_position(tb, h);
}
static inline void buffer_info_init_right(struct tree_balance *tb,
struct buffer_info *bi, int h)
{
bi->bi_fs = tb->tb_fs;
bi->bi_bh = tb->R[h];
bi->bi_parent = tb->FR[h];
bi->bi_position = get_right_neighbor_position(tb, h);
}
static inline void buffer_info_init_last(struct tree_balance *tb,
struct buffer_info *bi)
{
bi->bi_fs = tb->tb_fs;
bi->bi_bh = PATH_PLAST_BUFFER(tb->tb_path);
bi->bi_parent = PATH_H_PPARENT(tb->tb_path, 0);
bi->bi_position = PATH_H_B_ITEM_ORDER(tb->tb_path, 0);
}
static inline void buffer_info_init_tbSh(struct tree_balance *tb,
struct buffer_info *bi, int h)
{
bi->bi_fs = tb->tb_fs;
bi->bi_bh = PATH_H_PBUFFER(tb->tb_path, h);
bi->bi_parent = PATH_H_PPARENT(tb->tb_path, h);
bi->bi_position = PATH_H_POSITION(tb->tb_path, h + 1);
}
static inline void buffer_info_init_tbS0(struct tree_balance *tb,
struct buffer_info *bi)
{
buffer_info_init_tbSh(tb, bi, 0);
}
static inline void buffer_info_init_bh(struct tree_balance *tb,
struct buffer_info *bi,
struct buffer_head *bh)
{
bi->bi_fs = tb->tb_fs;
bi->bi_bh = bh;
bi->bi_parent = NULL;
bi->bi_position = 0;
}
#endif
/*