diff options
Diffstat (limited to 'fs/reiserfs/stree.c')
-rw-r--r-- | fs/reiserfs/stree.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index 8f220fb777d7..5e867be559ea 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c | |||
@@ -1063,17 +1063,17 @@ static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th, st | |||
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | /* Calculate number of bytes which will be deleted or cut during balance */ | 1065 | /* Calculate number of bytes which will be deleted or cut during balance */ |
1066 | static int calc_deleted_bytes_number(struct tree_balance *p_s_tb, char c_mode) | 1066 | static int calc_deleted_bytes_number(struct tree_balance *tb, char c_mode) |
1067 | { | 1067 | { |
1068 | int n_del_size; | 1068 | int n_del_size; |
1069 | struct item_head *p_le_ih = PATH_PITEM_HEAD(p_s_tb->tb_path); | 1069 | struct item_head *p_le_ih = PATH_PITEM_HEAD(tb->tb_path); |
1070 | 1070 | ||
1071 | if (is_statdata_le_ih(p_le_ih)) | 1071 | if (is_statdata_le_ih(p_le_ih)) |
1072 | return 0; | 1072 | return 0; |
1073 | 1073 | ||
1074 | n_del_size = | 1074 | n_del_size = |
1075 | (c_mode == | 1075 | (c_mode == |
1076 | M_DELETE) ? ih_item_len(p_le_ih) : -p_s_tb->insert_size[0]; | 1076 | M_DELETE) ? ih_item_len(p_le_ih) : -tb->insert_size[0]; |
1077 | if (is_direntry_le_ih(p_le_ih)) { | 1077 | if (is_direntry_le_ih(p_le_ih)) { |
1078 | // return EMPTY_DIR_SIZE; /* We delete emty directoris only. */ | 1078 | // return EMPTY_DIR_SIZE; /* We delete emty directoris only. */ |
1079 | // we can't use EMPTY_DIR_SIZE, as old format dirs have a different | 1079 | // we can't use EMPTY_DIR_SIZE, as old format dirs have a different |
@@ -1083,25 +1083,26 @@ static int calc_deleted_bytes_number(struct tree_balance *p_s_tb, char c_mode) | |||
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | if (is_indirect_le_ih(p_le_ih)) | 1085 | if (is_indirect_le_ih(p_le_ih)) |
1086 | n_del_size = (n_del_size / UNFM_P_SIZE) * (PATH_PLAST_BUFFER(p_s_tb->tb_path)->b_size); // - get_ih_free_space (p_le_ih); | 1086 | n_del_size = (n_del_size / UNFM_P_SIZE) * |
1087 | (PATH_PLAST_BUFFER(tb->tb_path)->b_size); | ||
1087 | return n_del_size; | 1088 | return n_del_size; |
1088 | } | 1089 | } |
1089 | 1090 | ||
1090 | static void init_tb_struct(struct reiserfs_transaction_handle *th, | 1091 | static void init_tb_struct(struct reiserfs_transaction_handle *th, |
1091 | struct tree_balance *p_s_tb, | 1092 | struct tree_balance *tb, |
1092 | struct super_block *sb, | 1093 | struct super_block *sb, |
1093 | struct treepath *p_s_path, int n_size) | 1094 | struct treepath *p_s_path, int n_size) |
1094 | { | 1095 | { |
1095 | 1096 | ||
1096 | BUG_ON(!th->t_trans_id); | 1097 | BUG_ON(!th->t_trans_id); |
1097 | 1098 | ||
1098 | memset(p_s_tb, '\0', sizeof(struct tree_balance)); | 1099 | memset(tb, '\0', sizeof(struct tree_balance)); |
1099 | p_s_tb->transaction_handle = th; | 1100 | tb->transaction_handle = th; |
1100 | p_s_tb->tb_sb = sb; | 1101 | tb->tb_sb = sb; |
1101 | p_s_tb->tb_path = p_s_path; | 1102 | tb->tb_path = p_s_path; |
1102 | PATH_OFFSET_PBUFFER(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = NULL; | 1103 | PATH_OFFSET_PBUFFER(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = NULL; |
1103 | PATH_OFFSET_POSITION(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = 0; | 1104 | PATH_OFFSET_POSITION(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = 0; |
1104 | p_s_tb->insert_size[0] = n_size; | 1105 | tb->insert_size[0] = n_size; |
1105 | } | 1106 | } |
1106 | 1107 | ||
1107 | void padd_item(char *item, int total_length, int length) | 1108 | void padd_item(char *item, int total_length, int length) |