[PATCH] struct path: rename Reiserfs's struct path
Rename Reiserfs's struct path to struct treepath to prevent name collision between it and struct path from fs/namei.c. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Cc: <reiserfs-dev@namesys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0cc72dc7f0
commit
fec6d055da
@@ -957,7 +957,7 @@ static int get_far_parent(struct tree_balance *p_s_tb,
|
||||
{
|
||||
struct buffer_head *p_s_parent;
|
||||
INITIALIZE_PATH(s_path_to_neighbor_father);
|
||||
struct path *p_s_path = p_s_tb->tb_path;
|
||||
struct treepath *p_s_path = p_s_tb->tb_path;
|
||||
struct cpu_key s_lr_father_key;
|
||||
int n_counter,
|
||||
n_position = INT_MAX,
|
||||
@@ -1074,7 +1074,7 @@ static int get_far_parent(struct tree_balance *p_s_tb,
|
||||
*/
|
||||
static int get_parents(struct tree_balance *p_s_tb, int n_h)
|
||||
{
|
||||
struct path *p_s_path = p_s_tb->tb_path;
|
||||
struct treepath *p_s_path = p_s_tb->tb_path;
|
||||
int n_position,
|
||||
n_ret_value,
|
||||
n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h);
|
||||
@@ -1885,7 +1885,7 @@ static int check_balance(int mode,
|
||||
static int get_direct_parent(struct tree_balance *p_s_tb, int n_h)
|
||||
{
|
||||
struct buffer_head *p_s_bh;
|
||||
struct path *p_s_path = p_s_tb->tb_path;
|
||||
struct treepath *p_s_path = p_s_tb->tb_path;
|
||||
int n_position,
|
||||
n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user