diff options
-rw-r--r-- | fs/reiserfs/bitmap.c | 2 | ||||
-rw-r--r-- | fs/reiserfs/fix_node.c | 6 | ||||
-rw-r--r-- | fs/reiserfs/inode.c | 12 | ||||
-rw-r--r-- | fs/reiserfs/namei.c | 6 | ||||
-rw-r--r-- | fs/reiserfs/stree.c | 42 | ||||
-rw-r--r-- | fs/reiserfs/tail_conversion.c | 4 | ||||
-rw-r--r-- | include/linux/reiserfs_fs.h | 44 |
7 files changed, 58 insertions, 58 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index e3d466a228d4..b286ccb08587 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c | |||
@@ -708,7 +708,7 @@ static void oid_groups(reiserfs_blocknr_hint_t * hint) | |||
708 | */ | 708 | */ |
709 | static int get_left_neighbor(reiserfs_blocknr_hint_t * hint) | 709 | static int get_left_neighbor(reiserfs_blocknr_hint_t * hint) |
710 | { | 710 | { |
711 | struct path *path; | 711 | struct treepath *path; |
712 | struct buffer_head *bh; | 712 | struct buffer_head *bh; |
713 | struct item_head *ih; | 713 | struct item_head *ih; |
714 | int pos_in_item; | 714 | int pos_in_item; |
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 | ||
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 254239e6f9e3..f3d1c4a77979 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
@@ -207,7 +207,7 @@ static int file_capable(struct inode *inode, long block) | |||
207 | } | 207 | } |
208 | 208 | ||
209 | /*static*/ int restart_transaction(struct reiserfs_transaction_handle *th, | 209 | /*static*/ int restart_transaction(struct reiserfs_transaction_handle *th, |
210 | struct inode *inode, struct path *path) | 210 | struct inode *inode, struct treepath *path) |
211 | { | 211 | { |
212 | struct super_block *s = th->t_super; | 212 | struct super_block *s = th->t_super; |
213 | int len = th->t_blocks_allocated; | 213 | int len = th->t_blocks_allocated; |
@@ -570,7 +570,7 @@ static inline int _allocate_block(struct reiserfs_transaction_handle *th, | |||
570 | long block, | 570 | long block, |
571 | struct inode *inode, | 571 | struct inode *inode, |
572 | b_blocknr_t * allocated_block_nr, | 572 | b_blocknr_t * allocated_block_nr, |
573 | struct path *path, int flags) | 573 | struct treepath *path, int flags) |
574 | { | 574 | { |
575 | BUG_ON(!th->t_trans_id); | 575 | BUG_ON(!th->t_trans_id); |
576 | 576 | ||
@@ -1107,7 +1107,7 @@ static inline ulong to_fake_used_blocks(struct inode *inode, int sd_size) | |||
1107 | // | 1107 | // |
1108 | 1108 | ||
1109 | // called by read_locked_inode | 1109 | // called by read_locked_inode |
1110 | static void init_inode(struct inode *inode, struct path *path) | 1110 | static void init_inode(struct inode *inode, struct treepath *path) |
1111 | { | 1111 | { |
1112 | struct buffer_head *bh; | 1112 | struct buffer_head *bh; |
1113 | struct item_head *ih; | 1113 | struct item_head *ih; |
@@ -1284,7 +1284,7 @@ static void inode2sd_v1(void *sd, struct inode *inode, loff_t size) | |||
1284 | /* NOTE, you must prepare the buffer head before sending it here, | 1284 | /* NOTE, you must prepare the buffer head before sending it here, |
1285 | ** and then log it after the call | 1285 | ** and then log it after the call |
1286 | */ | 1286 | */ |
1287 | static void update_stat_data(struct path *path, struct inode *inode, | 1287 | static void update_stat_data(struct treepath *path, struct inode *inode, |
1288 | loff_t size) | 1288 | loff_t size) |
1289 | { | 1289 | { |
1290 | struct buffer_head *bh; | 1290 | struct buffer_head *bh; |
@@ -1653,7 +1653,7 @@ int reiserfs_write_inode(struct inode *inode, int do_sync) | |||
1653 | containing "." and ".." entries */ | 1653 | containing "." and ".." entries */ |
1654 | static int reiserfs_new_directory(struct reiserfs_transaction_handle *th, | 1654 | static int reiserfs_new_directory(struct reiserfs_transaction_handle *th, |
1655 | struct inode *inode, | 1655 | struct inode *inode, |
1656 | struct item_head *ih, struct path *path, | 1656 | struct item_head *ih, struct treepath *path, |
1657 | struct inode *dir) | 1657 | struct inode *dir) |
1658 | { | 1658 | { |
1659 | struct super_block *sb = th->t_super; | 1659 | struct super_block *sb = th->t_super; |
@@ -1712,7 +1712,7 @@ static int reiserfs_new_directory(struct reiserfs_transaction_handle *th, | |||
1712 | containing the body of symlink */ | 1712 | containing the body of symlink */ |
1713 | static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct inode *inode, /* Inode of symlink */ | 1713 | static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct inode *inode, /* Inode of symlink */ |
1714 | struct item_head *ih, | 1714 | struct item_head *ih, |
1715 | struct path *path, const char *symname, | 1715 | struct treepath *path, const char *symname, |
1716 | int item_len) | 1716 | int item_len) |
1717 | { | 1717 | { |
1718 | struct super_block *sb = th->t_super; | 1718 | struct super_block *sb = th->t_super; |
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index abde1edc2235..23f5cd5bbf56 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
@@ -54,7 +54,7 @@ static int bin_search_in_dir_item(struct reiserfs_dir_entry *de, loff_t off) | |||
54 | 54 | ||
55 | // comment? maybe something like set de to point to what the path points to? | 55 | // comment? maybe something like set de to point to what the path points to? |
56 | static inline void set_de_item_location(struct reiserfs_dir_entry *de, | 56 | static inline void set_de_item_location(struct reiserfs_dir_entry *de, |
57 | struct path *path) | 57 | struct treepath *path) |
58 | { | 58 | { |
59 | de->de_bh = get_last_bh(path); | 59 | de->de_bh = get_last_bh(path); |
60 | de->de_ih = get_ih(path); | 60 | de->de_ih = get_ih(path); |
@@ -113,7 +113,7 @@ entry position in the item | |||
113 | 113 | ||
114 | /* The function is NOT SCHEDULE-SAFE! */ | 114 | /* The function is NOT SCHEDULE-SAFE! */ |
115 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, | 115 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, |
116 | struct path *path, struct reiserfs_dir_entry *de) | 116 | struct treepath *path, struct reiserfs_dir_entry *de) |
117 | { | 117 | { |
118 | int retval; | 118 | int retval; |
119 | 119 | ||
@@ -282,7 +282,7 @@ static int linear_search_in_dir_item(struct cpu_key *key, | |||
282 | // may return NAME_FOUND, NAME_FOUND_INVISIBLE, NAME_NOT_FOUND | 282 | // may return NAME_FOUND, NAME_FOUND_INVISIBLE, NAME_NOT_FOUND |
283 | // FIXME: should add something like IOERROR | 283 | // FIXME: should add something like IOERROR |
284 | static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, | 284 | static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, |
285 | struct path *path_to_entry, | 285 | struct treepath *path_to_entry, |
286 | struct reiserfs_dir_entry *de) | 286 | struct reiserfs_dir_entry *de) |
287 | { | 287 | { |
288 | struct cpu_key key_to_search; | 288 | struct cpu_key key_to_search; |
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index 5240abe1a709..47e7027ea39f 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c | |||
@@ -244,7 +244,7 @@ static const struct reiserfs_key MAX_KEY = { | |||
244 | of the path, and going upwards. We must check the path's validity at each step. If the key is not in | 244 | of the path, and going upwards. We must check the path's validity at each step. If the key is not in |
245 | the path, there is no delimiting key in the tree (buffer is first or last buffer in tree), and in this | 245 | the path, there is no delimiting key in the tree (buffer is first or last buffer in tree), and in this |
246 | case we return a special key, either MIN_KEY or MAX_KEY. */ | 246 | case we return a special key, either MIN_KEY or MAX_KEY. */ |
247 | static inline const struct reiserfs_key *get_lkey(const struct path | 247 | static inline const struct reiserfs_key *get_lkey(const struct treepath |
248 | *p_s_chk_path, | 248 | *p_s_chk_path, |
249 | const struct super_block | 249 | const struct super_block |
250 | *p_s_sb) | 250 | *p_s_sb) |
@@ -290,7 +290,7 @@ static inline const struct reiserfs_key *get_lkey(const struct path | |||
290 | } | 290 | } |
291 | 291 | ||
292 | /* Get delimiting key of the buffer at the path and its right neighbor. */ | 292 | /* Get delimiting key of the buffer at the path and its right neighbor. */ |
293 | inline const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path, | 293 | inline const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path, |
294 | const struct super_block *p_s_sb) | 294 | const struct super_block *p_s_sb) |
295 | { | 295 | { |
296 | int n_position, n_path_offset = p_s_chk_path->path_length; | 296 | int n_position, n_path_offset = p_s_chk_path->path_length; |
@@ -337,7 +337,7 @@ inline const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path, | |||
337 | the path. These delimiting keys are stored at least one level above that buffer in the tree. If the | 337 | the path. These delimiting keys are stored at least one level above that buffer in the tree. If the |
338 | buffer is the first or last node in the tree order then one of the delimiting keys may be absent, and in | 338 | buffer is the first or last node in the tree order then one of the delimiting keys may be absent, and in |
339 | this case get_lkey and get_rkey return a special key which is MIN_KEY or MAX_KEY. */ | 339 | this case get_lkey and get_rkey return a special key which is MIN_KEY or MAX_KEY. */ |
340 | static inline int key_in_buffer(struct path *p_s_chk_path, /* Path which should be checked. */ | 340 | static inline int key_in_buffer(struct treepath *p_s_chk_path, /* Path which should be checked. */ |
341 | const struct cpu_key *p_s_key, /* Key which should be checked. */ | 341 | const struct cpu_key *p_s_key, /* Key which should be checked. */ |
342 | struct super_block *p_s_sb /* Super block pointer. */ | 342 | struct super_block *p_s_sb /* Super block pointer. */ |
343 | ) | 343 | ) |
@@ -374,7 +374,7 @@ inline void decrement_bcount(struct buffer_head *p_s_bh) | |||
374 | } | 374 | } |
375 | 375 | ||
376 | /* Decrement b_count field of the all buffers in the path. */ | 376 | /* Decrement b_count field of the all buffers in the path. */ |
377 | void decrement_counters_in_path(struct path *p_s_search_path) | 377 | void decrement_counters_in_path(struct treepath *p_s_search_path) |
378 | { | 378 | { |
379 | int n_path_offset = p_s_search_path->path_length; | 379 | int n_path_offset = p_s_search_path->path_length; |
380 | 380 | ||
@@ -391,7 +391,7 @@ void decrement_counters_in_path(struct path *p_s_search_path) | |||
391 | p_s_search_path->path_length = ILLEGAL_PATH_ELEMENT_OFFSET; | 391 | p_s_search_path->path_length = ILLEGAL_PATH_ELEMENT_OFFSET; |
392 | } | 392 | } |
393 | 393 | ||
394 | int reiserfs_check_path(struct path *p) | 394 | int reiserfs_check_path(struct treepath *p) |
395 | { | 395 | { |
396 | RFALSE(p->path_length != ILLEGAL_PATH_ELEMENT_OFFSET, | 396 | RFALSE(p->path_length != ILLEGAL_PATH_ELEMENT_OFFSET, |
397 | "path not properly relsed"); | 397 | "path not properly relsed"); |
@@ -403,7 +403,7 @@ int reiserfs_check_path(struct path *p) | |||
403 | ** | 403 | ** |
404 | ** only called from fix_nodes() | 404 | ** only called from fix_nodes() |
405 | */ | 405 | */ |
406 | void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path) | 406 | void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path) |
407 | { | 407 | { |
408 | int n_path_offset = p_s_search_path->path_length; | 408 | int n_path_offset = p_s_search_path->path_length; |
409 | 409 | ||
@@ -421,7 +421,7 @@ void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path) | |||
421 | } | 421 | } |
422 | 422 | ||
423 | /* Release all buffers in the path. */ | 423 | /* Release all buffers in the path. */ |
424 | void pathrelse(struct path *p_s_search_path) | 424 | void pathrelse(struct treepath *p_s_search_path) |
425 | { | 425 | { |
426 | int n_path_offset = p_s_search_path->path_length; | 426 | int n_path_offset = p_s_search_path->path_length; |
427 | 427 | ||
@@ -602,7 +602,7 @@ static void search_by_key_reada(struct super_block *s, | |||
602 | correctness of the bottom of the path */ | 602 | correctness of the bottom of the path */ |
603 | /* The function is NOT SCHEDULE-SAFE! */ | 603 | /* The function is NOT SCHEDULE-SAFE! */ |
604 | int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /* Key to search. */ | 604 | int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /* Key to search. */ |
605 | struct path *p_s_search_path, /* This structure was | 605 | struct treepath *p_s_search_path,/* This structure was |
606 | allocated and initialized | 606 | allocated and initialized |
607 | by the calling | 607 | by the calling |
608 | function. It is filled up | 608 | function. It is filled up |
@@ -813,7 +813,7 @@ int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /* | |||
813 | /* The function is NOT SCHEDULE-SAFE! */ | 813 | /* The function is NOT SCHEDULE-SAFE! */ |
814 | int search_for_position_by_key(struct super_block *p_s_sb, /* Pointer to the super block. */ | 814 | int search_for_position_by_key(struct super_block *p_s_sb, /* Pointer to the super block. */ |
815 | const struct cpu_key *p_cpu_key, /* Key to search (cpu variable) */ | 815 | const struct cpu_key *p_cpu_key, /* Key to search (cpu variable) */ |
816 | struct path *p_s_search_path /* Filled up by this function. */ | 816 | struct treepath *p_s_search_path /* Filled up by this function. */ |
817 | ) | 817 | ) |
818 | { | 818 | { |
819 | struct item_head *p_le_ih; /* pointer to on-disk structure */ | 819 | struct item_head *p_le_ih; /* pointer to on-disk structure */ |
@@ -884,7 +884,7 @@ int search_for_position_by_key(struct super_block *p_s_sb, /* Pointer to the sup | |||
884 | } | 884 | } |
885 | 885 | ||
886 | /* Compare given item and item pointed to by the path. */ | 886 | /* Compare given item and item pointed to by the path. */ |
887 | int comp_items(const struct item_head *stored_ih, const struct path *p_s_path) | 887 | int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path) |
888 | { | 888 | { |
889 | struct buffer_head *p_s_bh; | 889 | struct buffer_head *p_s_bh; |
890 | struct item_head *ih; | 890 | struct item_head *ih; |
@@ -911,7 +911,7 @@ int comp_items(const struct item_head *stored_ih, const struct path *p_s_path) | |||
911 | #define block_in_use(bh) (buffer_locked(bh) || (held_by_others(bh))) | 911 | #define block_in_use(bh) (buffer_locked(bh) || (held_by_others(bh))) |
912 | 912 | ||
913 | // prepare for delete or cut of direct item | 913 | // prepare for delete or cut of direct item |
914 | static inline int prepare_for_direct_item(struct path *path, | 914 | static inline int prepare_for_direct_item(struct treepath *path, |
915 | struct item_head *le_ih, | 915 | struct item_head *le_ih, |
916 | struct inode *inode, | 916 | struct inode *inode, |
917 | loff_t new_file_length, int *cut_size) | 917 | loff_t new_file_length, int *cut_size) |
@@ -952,7 +952,7 @@ static inline int prepare_for_direct_item(struct path *path, | |||
952 | return M_CUT; /* Cut from this item. */ | 952 | return M_CUT; /* Cut from this item. */ |
953 | } | 953 | } |
954 | 954 | ||
955 | static inline int prepare_for_direntry_item(struct path *path, | 955 | static inline int prepare_for_direntry_item(struct treepath *path, |
956 | struct item_head *le_ih, | 956 | struct item_head *le_ih, |
957 | struct inode *inode, | 957 | struct inode *inode, |
958 | loff_t new_file_length, | 958 | loff_t new_file_length, |
@@ -987,7 +987,7 @@ static inline int prepare_for_direntry_item(struct path *path, | |||
987 | In case of file truncate calculate whether this item must be deleted/truncated or last | 987 | In case of file truncate calculate whether this item must be deleted/truncated or last |
988 | unformatted node of this item will be converted to a direct item. | 988 | unformatted node of this item will be converted to a direct item. |
989 | This function returns a determination of what balance mode the calling function should employ. */ | 989 | This function returns a determination of what balance mode the calling function should employ. */ |
990 | static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th, struct inode *inode, struct path *p_s_path, const struct cpu_key *p_s_item_key, int *p_n_removed, /* Number of unformatted nodes which were removed | 990 | static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th, struct inode *inode, struct treepath *p_s_path, const struct cpu_key *p_s_item_key, int *p_n_removed, /* Number of unformatted nodes which were removed |
991 | from end of the file. */ | 991 | from end of the file. */ |
992 | int *p_n_cut_size, unsigned long long n_new_file_length /* MAX_KEY_OFFSET in case of delete. */ | 992 | int *p_n_cut_size, unsigned long long n_new_file_length /* MAX_KEY_OFFSET in case of delete. */ |
993 | ) | 993 | ) |
@@ -1125,7 +1125,7 @@ static int calc_deleted_bytes_number(struct tree_balance *p_s_tb, char c_mode) | |||
1125 | static void init_tb_struct(struct reiserfs_transaction_handle *th, | 1125 | static void init_tb_struct(struct reiserfs_transaction_handle *th, |
1126 | struct tree_balance *p_s_tb, | 1126 | struct tree_balance *p_s_tb, |
1127 | struct super_block *p_s_sb, | 1127 | struct super_block *p_s_sb, |
1128 | struct path *p_s_path, int n_size) | 1128 | struct treepath *p_s_path, int n_size) |
1129 | { | 1129 | { |
1130 | 1130 | ||
1131 | BUG_ON(!th->t_trans_id); | 1131 | BUG_ON(!th->t_trans_id); |
@@ -1176,7 +1176,7 @@ char head2type(struct item_head *ih) | |||
1176 | #endif | 1176 | #endif |
1177 | 1177 | ||
1178 | /* Delete object item. */ | 1178 | /* Delete object item. */ |
1179 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, struct path *p_s_path, /* Path to the deleted item. */ | 1179 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, struct treepath *p_s_path, /* Path to the deleted item. */ |
1180 | const struct cpu_key *p_s_item_key, /* Key to search for the deleted item. */ | 1180 | const struct cpu_key *p_s_item_key, /* Key to search for the deleted item. */ |
1181 | struct inode *p_s_inode, /* inode is here just to update i_blocks and quotas */ | 1181 | struct inode *p_s_inode, /* inode is here just to update i_blocks and quotas */ |
1182 | struct buffer_head *p_s_un_bh) | 1182 | struct buffer_head *p_s_un_bh) |
@@ -1468,7 +1468,7 @@ static void unmap_buffers(struct page *page, loff_t pos) | |||
1468 | static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th, | 1468 | static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th, |
1469 | struct inode *p_s_inode, | 1469 | struct inode *p_s_inode, |
1470 | struct page *page, | 1470 | struct page *page, |
1471 | struct path *p_s_path, | 1471 | struct treepath *p_s_path, |
1472 | const struct cpu_key *p_s_item_key, | 1472 | const struct cpu_key *p_s_item_key, |
1473 | loff_t n_new_file_size, char *p_c_mode) | 1473 | loff_t n_new_file_size, char *p_c_mode) |
1474 | { | 1474 | { |
@@ -1503,7 +1503,7 @@ static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th, | |||
1503 | pointer being converted. Therefore we have to delete inserted | 1503 | pointer being converted. Therefore we have to delete inserted |
1504 | direct item(s) */ | 1504 | direct item(s) */ |
1505 | static void indirect_to_direct_roll_back(struct reiserfs_transaction_handle *th, | 1505 | static void indirect_to_direct_roll_back(struct reiserfs_transaction_handle *th, |
1506 | struct inode *inode, struct path *path) | 1506 | struct inode *inode, struct treepath *path) |
1507 | { | 1507 | { |
1508 | struct cpu_key tail_key; | 1508 | struct cpu_key tail_key; |
1509 | int tail_len; | 1509 | int tail_len; |
@@ -1545,7 +1545,7 @@ static void indirect_to_direct_roll_back(struct reiserfs_transaction_handle *th, | |||
1545 | 1545 | ||
1546 | /* (Truncate or cut entry) or delete object item. Returns < 0 on failure */ | 1546 | /* (Truncate or cut entry) or delete object item. Returns < 0 on failure */ |
1547 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, | 1547 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, |
1548 | struct path *p_s_path, | 1548 | struct treepath *p_s_path, |
1549 | struct cpu_key *p_s_item_key, | 1549 | struct cpu_key *p_s_item_key, |
1550 | struct inode *p_s_inode, | 1550 | struct inode *p_s_inode, |
1551 | struct page *page, loff_t n_new_file_size) | 1551 | struct page *page, loff_t n_new_file_size) |
@@ -1920,7 +1920,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th, struct inode *p | |||
1920 | 1920 | ||
1921 | #ifdef CONFIG_REISERFS_CHECK | 1921 | #ifdef CONFIG_REISERFS_CHECK |
1922 | // this makes sure, that we __append__, not overwrite or add holes | 1922 | // this makes sure, that we __append__, not overwrite or add holes |
1923 | static void check_research_for_paste(struct path *path, | 1923 | static void check_research_for_paste(struct treepath *path, |
1924 | const struct cpu_key *p_s_key) | 1924 | const struct cpu_key *p_s_key) |
1925 | { | 1925 | { |
1926 | struct item_head *found_ih = get_ih(path); | 1926 | struct item_head *found_ih = get_ih(path); |
@@ -1954,7 +1954,7 @@ static void check_research_for_paste(struct path *path, | |||
1954 | #endif /* config reiserfs check */ | 1954 | #endif /* config reiserfs check */ |
1955 | 1955 | ||
1956 | /* Paste bytes to the existing item. Returns bytes number pasted into the item. */ | 1956 | /* Paste bytes to the existing item. Returns bytes number pasted into the item. */ |
1957 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct path *p_s_search_path, /* Path to the pasted item. */ | 1957 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct treepath *p_s_search_path, /* Path to the pasted item. */ |
1958 | const struct cpu_key *p_s_key, /* Key to search for the needed item. */ | 1958 | const struct cpu_key *p_s_key, /* Key to search for the needed item. */ |
1959 | struct inode *inode, /* Inode item belongs to */ | 1959 | struct inode *inode, /* Inode item belongs to */ |
1960 | const char *p_c_body, /* Pointer to the bytes to paste. */ | 1960 | const char *p_c_body, /* Pointer to the bytes to paste. */ |
@@ -2036,7 +2036,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct path | |||
2036 | } | 2036 | } |
2037 | 2037 | ||
2038 | /* Insert new item into the buffer at the path. */ | 2038 | /* Insert new item into the buffer at the path. */ |
2039 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, struct path *p_s_path, /* Path to the inserteded item. */ | 2039 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, struct treepath *p_s_path, /* Path to the inserteded item. */ |
2040 | const struct cpu_key *key, struct item_head *p_s_ih, /* Pointer to the item header to insert. */ | 2040 | const struct cpu_key *key, struct item_head *p_s_ih, /* Pointer to the item header to insert. */ |
2041 | struct inode *inode, const char *p_c_body) | 2041 | struct inode *inode, const char *p_c_body) |
2042 | { /* Pointer to the bytes to insert. */ | 2042 | { /* Pointer to the bytes to insert. */ |
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index 36f108fc1cf5..f8121a1147e8 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
@@ -15,7 +15,7 @@ | |||
15 | /* path points to first direct item of the file regarless of how many of | 15 | /* path points to first direct item of the file regarless of how many of |
16 | them are there */ | 16 | them are there */ |
17 | int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, | 17 | int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, |
18 | struct path *path, struct buffer_head *unbh, | 18 | struct treepath *path, struct buffer_head *unbh, |
19 | loff_t tail_offset) | 19 | loff_t tail_offset) |
20 | { | 20 | { |
21 | struct super_block *sb = inode->i_sb; | 21 | struct super_block *sb = inode->i_sb; |
@@ -171,7 +171,7 @@ void reiserfs_unmap_buffer(struct buffer_head *bh) | |||
171 | what we expect from it (number of cut bytes). But when tail remains | 171 | what we expect from it (number of cut bytes). But when tail remains |
172 | in the unformatted node, we set mode to SKIP_BALANCING and unlock | 172 | in the unformatted node, we set mode to SKIP_BALANCING and unlock |
173 | inode */ | 173 | inode */ |
174 | int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_inode, struct page *page, struct path *p_s_path, /* path to the indirect item. */ | 174 | int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_inode, struct page *page, struct treepath *p_s_path, /* path to the indirect item. */ |
175 | const struct cpu_key *p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ | 175 | const struct cpu_key *p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ |
176 | loff_t n_new_file_size, /* New file size. */ | 176 | loff_t n_new_file_size, /* New file size. */ |
177 | char *p_c_mode) | 177 | char *p_c_mode) |
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index d0e4dce33ad5..c3fc6caaad3f 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
@@ -1159,7 +1159,7 @@ znodes are the way! */ | |||
1159 | #define PATH_READA 0x1 /* do read ahead */ | 1159 | #define PATH_READA 0x1 /* do read ahead */ |
1160 | #define PATH_READA_BACK 0x2 /* read backwards */ | 1160 | #define PATH_READA_BACK 0x2 /* read backwards */ |
1161 | 1161 | ||
1162 | struct path { | 1162 | struct treepath { |
1163 | int path_length; /* Length of the array above. */ | 1163 | int path_length; /* Length of the array above. */ |
1164 | int reada; | 1164 | int reada; |
1165 | struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements. */ | 1165 | struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements. */ |
@@ -1169,7 +1169,7 @@ struct path { | |||
1169 | #define pos_in_item(path) ((path)->pos_in_item) | 1169 | #define pos_in_item(path) ((path)->pos_in_item) |
1170 | 1170 | ||
1171 | #define INITIALIZE_PATH(var) \ | 1171 | #define INITIALIZE_PATH(var) \ |
1172 | struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} | 1172 | struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} |
1173 | 1173 | ||
1174 | /* Get path element by path and path position. */ | 1174 | /* Get path element by path and path position. */ |
1175 | #define PATH_OFFSET_PELEMENT(p_s_path,n_offset) ((p_s_path)->path_elements +(n_offset)) | 1175 | #define PATH_OFFSET_PELEMENT(p_s_path,n_offset) ((p_s_path)->path_elements +(n_offset)) |
@@ -1327,7 +1327,7 @@ struct tree_balance { | |||
1327 | int need_balance_dirty; | 1327 | int need_balance_dirty; |
1328 | struct super_block *tb_sb; | 1328 | struct super_block *tb_sb; |
1329 | struct reiserfs_transaction_handle *transaction_handle; | 1329 | struct reiserfs_transaction_handle *transaction_handle; |
1330 | struct path *tb_path; | 1330 | struct treepath *tb_path; |
1331 | struct buffer_head *L[MAX_HEIGHT]; /* array of left neighbors of nodes in the path */ | 1331 | struct buffer_head *L[MAX_HEIGHT]; /* array of left neighbors of nodes in the path */ |
1332 | struct buffer_head *R[MAX_HEIGHT]; /* array of right neighbors of nodes in the path */ | 1332 | struct buffer_head *R[MAX_HEIGHT]; /* array of right neighbors of nodes in the path */ |
1333 | struct buffer_head *FL[MAX_HEIGHT]; /* array of fathers of the left neighbors */ | 1333 | struct buffer_head *FL[MAX_HEIGHT]; /* array of fathers of the left neighbors */ |
@@ -1793,41 +1793,41 @@ static inline void copy_key(struct reiserfs_key *to, | |||
1793 | memcpy(to, from, KEY_SIZE); | 1793 | memcpy(to, from, KEY_SIZE); |
1794 | } | 1794 | } |
1795 | 1795 | ||
1796 | int comp_items(const struct item_head *stored_ih, const struct path *p_s_path); | 1796 | int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path); |
1797 | const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path, | 1797 | const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path, |
1798 | const struct super_block *p_s_sb); | 1798 | const struct super_block *p_s_sb); |
1799 | int search_by_key(struct super_block *, const struct cpu_key *, | 1799 | int search_by_key(struct super_block *, const struct cpu_key *, |
1800 | struct path *, int); | 1800 | struct treepath *, int); |
1801 | #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL) | 1801 | #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL) |
1802 | int search_for_position_by_key(struct super_block *p_s_sb, | 1802 | int search_for_position_by_key(struct super_block *p_s_sb, |
1803 | const struct cpu_key *p_s_cpu_key, | 1803 | const struct cpu_key *p_s_cpu_key, |
1804 | struct path *p_s_search_path); | 1804 | struct treepath *p_s_search_path); |
1805 | extern void decrement_bcount(struct buffer_head *p_s_bh); | 1805 | extern void decrement_bcount(struct buffer_head *p_s_bh); |
1806 | void decrement_counters_in_path(struct path *p_s_search_path); | 1806 | void decrement_counters_in_path(struct treepath *p_s_search_path); |
1807 | void pathrelse(struct path *p_s_search_path); | 1807 | void pathrelse(struct treepath *p_s_search_path); |
1808 | int reiserfs_check_path(struct path *p); | 1808 | int reiserfs_check_path(struct treepath *p); |
1809 | void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path); | 1809 | void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path); |
1810 | 1810 | ||
1811 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, | 1811 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, |
1812 | struct path *path, | 1812 | struct treepath *path, |
1813 | const struct cpu_key *key, | 1813 | const struct cpu_key *key, |
1814 | struct item_head *ih, | 1814 | struct item_head *ih, |
1815 | struct inode *inode, const char *body); | 1815 | struct inode *inode, const char *body); |
1816 | 1816 | ||
1817 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, | 1817 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, |
1818 | struct path *path, | 1818 | struct treepath *path, |
1819 | const struct cpu_key *key, | 1819 | const struct cpu_key *key, |
1820 | struct inode *inode, | 1820 | struct inode *inode, |
1821 | const char *body, int paste_size); | 1821 | const char *body, int paste_size); |
1822 | 1822 | ||
1823 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, | 1823 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, |
1824 | struct path *path, | 1824 | struct treepath *path, |
1825 | struct cpu_key *key, | 1825 | struct cpu_key *key, |
1826 | struct inode *inode, | 1826 | struct inode *inode, |
1827 | struct page *page, loff_t new_file_size); | 1827 | struct page *page, loff_t new_file_size); |
1828 | 1828 | ||
1829 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, | 1829 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, |
1830 | struct path *path, | 1830 | struct treepath *path, |
1831 | const struct cpu_key *key, | 1831 | const struct cpu_key *key, |
1832 | struct inode *inode, struct buffer_head *p_s_un_bh); | 1832 | struct inode *inode, struct buffer_head *p_s_un_bh); |
1833 | 1833 | ||
@@ -1858,7 +1858,7 @@ void padd_item(char *item, int total_length, int length); | |||
1858 | #define GET_BLOCK_NO_DANGLE 16 /* don't leave any transactions running */ | 1858 | #define GET_BLOCK_NO_DANGLE 16 /* don't leave any transactions running */ |
1859 | 1859 | ||
1860 | int restart_transaction(struct reiserfs_transaction_handle *th, | 1860 | int restart_transaction(struct reiserfs_transaction_handle *th, |
1861 | struct inode *inode, struct path *path); | 1861 | struct inode *inode, struct treepath *path); |
1862 | void reiserfs_read_locked_inode(struct inode *inode, | 1862 | void reiserfs_read_locked_inode(struct inode *inode, |
1863 | struct reiserfs_iget_args *args); | 1863 | struct reiserfs_iget_args *args); |
1864 | int reiserfs_find_actor(struct inode *inode, void *p); | 1864 | int reiserfs_find_actor(struct inode *inode, void *p); |
@@ -1905,7 +1905,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr); | |||
1905 | /* namei.c */ | 1905 | /* namei.c */ |
1906 | void set_de_name_and_namelen(struct reiserfs_dir_entry *de); | 1906 | void set_de_name_and_namelen(struct reiserfs_dir_entry *de); |
1907 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, | 1907 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, |
1908 | struct path *path, struct reiserfs_dir_entry *de); | 1908 | struct treepath *path, struct reiserfs_dir_entry *de); |
1909 | struct dentry *reiserfs_get_parent(struct dentry *); | 1909 | struct dentry *reiserfs_get_parent(struct dentry *); |
1910 | /* procfs.c */ | 1910 | /* procfs.c */ |
1911 | 1911 | ||
@@ -1956,9 +1956,9 @@ extern const struct file_operations reiserfs_dir_operations; | |||
1956 | 1956 | ||
1957 | /* tail_conversion.c */ | 1957 | /* tail_conversion.c */ |
1958 | int direct2indirect(struct reiserfs_transaction_handle *, struct inode *, | 1958 | int direct2indirect(struct reiserfs_transaction_handle *, struct inode *, |
1959 | struct path *, struct buffer_head *, loff_t); | 1959 | struct treepath *, struct buffer_head *, loff_t); |
1960 | int indirect2direct(struct reiserfs_transaction_handle *, struct inode *, | 1960 | int indirect2direct(struct reiserfs_transaction_handle *, struct inode *, |
1961 | struct page *, struct path *, const struct cpu_key *, | 1961 | struct page *, struct treepath *, const struct cpu_key *, |
1962 | loff_t, char *); | 1962 | loff_t, char *); |
1963 | void reiserfs_unmap_buffer(struct buffer_head *); | 1963 | void reiserfs_unmap_buffer(struct buffer_head *); |
1964 | 1964 | ||
@@ -2045,7 +2045,7 @@ struct __reiserfs_blocknr_hint { | |||
2045 | struct inode *inode; /* inode passed to allocator, if we allocate unf. nodes */ | 2045 | struct inode *inode; /* inode passed to allocator, if we allocate unf. nodes */ |
2046 | long block; /* file offset, in blocks */ | 2046 | long block; /* file offset, in blocks */ |
2047 | struct in_core_key key; | 2047 | struct in_core_key key; |
2048 | struct path *path; /* search path, used by allocator to deternine search_start by | 2048 | struct treepath *path; /* search path, used by allocator to deternine search_start by |
2049 | * various ways */ | 2049 | * various ways */ |
2050 | struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and | 2050 | struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and |
2051 | * bitmap blocks changes */ | 2051 | * bitmap blocks changes */ |
@@ -2101,7 +2101,7 @@ static inline int reiserfs_new_form_blocknrs(struct tree_balance *tb, | |||
2101 | static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle | 2101 | static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle |
2102 | *th, struct inode *inode, | 2102 | *th, struct inode *inode, |
2103 | b_blocknr_t * new_blocknrs, | 2103 | b_blocknr_t * new_blocknrs, |
2104 | struct path *path, long block) | 2104 | struct treepath *path, long block) |
2105 | { | 2105 | { |
2106 | reiserfs_blocknr_hint_t hint = { | 2106 | reiserfs_blocknr_hint_t hint = { |
2107 | .th = th, | 2107 | .th = th, |
@@ -2118,7 +2118,7 @@ static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle | |||
2118 | static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle | 2118 | static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle |
2119 | *th, struct inode *inode, | 2119 | *th, struct inode *inode, |
2120 | b_blocknr_t * new_blocknrs, | 2120 | b_blocknr_t * new_blocknrs, |
2121 | struct path *path, long block) | 2121 | struct treepath *path, long block) |
2122 | { | 2122 | { |
2123 | reiserfs_blocknr_hint_t hint = { | 2123 | reiserfs_blocknr_hint_t hint = { |
2124 | .th = th, | 2124 | .th = th, |