diff options
author | Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> | 2006-12-08 05:36:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:40 -0500 |
commit | fec6d055da71fb02a76f9c2c12427fa79974018b (patch) | |
tree | d6fb2e5fea74ab83280389ef8a16564bf284ebc5 /fs/reiserfs/fix_node.c | |
parent | 0cc72dc7f050188d8d7344b1dd688cbc68d3cd30 (diff) |
[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>
Diffstat (limited to 'fs/reiserfs/fix_node.c')
-rw-r--r-- | fs/reiserfs/fix_node.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index 6d0e554daa9d..0ee35c6c9b72 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c | |||
@@ -957,7 +957,7 @@ static int get_far_parent(struct tree_balance *p_s_tb, | |||
957 | { | 957 | { |
958 | struct buffer_head *p_s_parent; | 958 | struct buffer_head *p_s_parent; |
959 | INITIALIZE_PATH(s_path_to_neighbor_father); | 959 | INITIALIZE_PATH(s_path_to_neighbor_father); |
960 | struct path *p_s_path = p_s_tb->tb_path; | 960 | struct treepath *p_s_path = p_s_tb->tb_path; |
961 | struct cpu_key s_lr_father_key; | 961 | struct cpu_key s_lr_father_key; |
962 | int n_counter, | 962 | int n_counter, |
963 | n_position = INT_MAX, | 963 | n_position = INT_MAX, |
@@ -1074,7 +1074,7 @@ static int get_far_parent(struct tree_balance *p_s_tb, | |||
1074 | */ | 1074 | */ |
1075 | static int get_parents(struct tree_balance *p_s_tb, int n_h) | 1075 | static int get_parents(struct tree_balance *p_s_tb, int n_h) |
1076 | { | 1076 | { |
1077 | struct path *p_s_path = p_s_tb->tb_path; | 1077 | struct treepath *p_s_path = p_s_tb->tb_path; |
1078 | int n_position, | 1078 | int n_position, |
1079 | n_ret_value, | 1079 | n_ret_value, |
1080 | n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h); | 1080 | n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h); |
@@ -1885,7 +1885,7 @@ static int check_balance(int mode, | |||
1885 | static int get_direct_parent(struct tree_balance *p_s_tb, int n_h) | 1885 | static int get_direct_parent(struct tree_balance *p_s_tb, int n_h) |
1886 | { | 1886 | { |
1887 | struct buffer_head *p_s_bh; | 1887 | struct buffer_head *p_s_bh; |
1888 | struct path *p_s_path = p_s_tb->tb_path; | 1888 | struct treepath *p_s_path = p_s_tb->tb_path; |
1889 | int n_position, | 1889 | int n_position, |
1890 | n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h); | 1890 | n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h); |
1891 | 1891 | ||