reiser4: node41 layout support
PATCH 1/2 reiser4: node41 layout support
Support of node41 layout (the same as node40, but
with 32-bit field for checksum).
Signed-off-by Edward Shishkin <[email protected]>
--- fs/reiser4/Makefile | 1 fs/reiser4/jnode.c | 11 -- fs/reiser4/plugin/disk_format/disk_format40.c | 7 + fs/reiser4/plugin/disk_format/disk_format40.h | 4 fs/reiser4/plugin/node/Makefile | 3 fs/reiser4/plugin/node/node.c | 38 ++++++ fs/reiser4/plugin/node/node.h | 6 - fs/reiser4/plugin/node/node40.c | 142 +++++++++++++++++--------- fs/reiser4/plugin/node/node40.h | 23 ++-- fs/reiser4/plugin/node/node41.c | 111 ++++++++++++++++++++ fs/reiser4/plugin/node/node41.h | 48 ++++++++ fs/reiser4/plugin/plugin.h | 2 fs/reiser4/reiser4.h | 1 13 files changed, 329 insertions(+), 68 deletions(-)
fs/reiser4/Makefile +1 -0
@@ -69,6 +69,7 @@ reiser4-y := \ plugin/dir/hashed_dir.o \ plugin/dir/seekable_dir.o \ plugin/node/node40.o \ + plugin/node/node41.o \ \ plugin/crypto/cipher.o \ plugin/crypto/digest.o \
fs/reiser4/plugin/node/Makefile +2 -1
@@ -2,4 +2,5 @@ obj-$(CONFIG_REISER4_FS) += node_plugins node_plugins-objs := \ node.o \ - node40.o + node40.o \ + node41.o
fs/reiser4/plugin/node/node.c +38 -0
@@ -116,6 +116,44 @@ node_plugin node_plugins[LAST_NODE_ID] = .max_item_size = max_item_size_node40, .prepare_removal = prepare_removal_node40, .set_item_plugin = set_item_plugin_node40 + }, + [NODE41_ID] = { + .h = { + .type_id = REISER4_NODE_PLUGIN_TYPE, + .id = NODE41_ID, + .pops = NULL, + .label = "node41", + .desc = "node41 layout", + .linkage = {NULL, NULL} + }, + .item_overhead = item_overhead_node40, + .free_space = free_space_node40, + .lookup = lookup_node40, + .num_of_items = num_of_items_node40, + .item_by_coord = item_by_coord_node40, + .length_by_coord = length_by_coord_node40, + .plugin_by_coord = plugin_by_coord_node40, + .key_at = key_at_node40, + .estimate = estimate_node40, + .check = NULL, + .parse = parse_node41, + .init = init_node41, +#ifdef GUESS_EXISTS + .guess = guess_node41, +#endif + .change_item_size = change_item_size_node40, + .create_item = create_item_node40, + .update_item_key = update_item_key_node40, + .cut_and_kill = kill_node40, + .cut = cut_node40, + .shift = shift_node41, + .shrink_item = shrink_item_node40, + .fast_insert = fast_insert_node40, + .fast_paste = fast_paste_node40, + .fast_cut = fast_cut_node40, + .max_item_size = max_item_size_node41, + .prepare_removal = prepare_removal_node40, + .set_item_plugin = set_item_plugin_node40 } };
fs/reiser4/plugin/node/node.h +3 -3
@@ -236,9 +236,9 @@ typedef struct node_plugin { } node_plugin;typedef enum { -/* standard unified node layout used for both leaf and internal -nodes */ -NODE40_ID , +NODE40_ID ,/* standard unified node layout used for both, +leaf and internal nodes */ +NODE41_ID ,/* unified node layout with a reference counter */ LAST_NODE_ID }reiser4_node_id ;
fs/reiser4/plugin/node/node40.c +97 -45
227 lines not on this page · raw message
fs/reiser4/plugin/node/node40.h +14 -9
@@ -78,11 +78,18 @@ item_plugin *plugin_by_coord_node40(consreiser4_key *key_at_node40 (const coord_t * coord,reiser4_key * key);size_t estimate_node40 (znode * node);int check_node40 (const znode * node,__u32 flags,const char **error); +int parse_node40_common (znode *node,const __u32 magic);int parse_node40 (znode * node); -int init_node40 (znode * node); +int init_node40_common (znode *node,node_plugin *nplug, +size_t node_header_size,const __u32 magic); +int init_node40 (znode *node); +#ifdef GUESS_EXISTS -int guess_node40 (const znode * node); +int guess_node40_common (const znode *node,reiser4_node_id id, +const __u32 magic); +int guess_node40 (const znode *node);#endif +void change_item_size_node40 (coord_t * coord,int by);int create_item_node40 (coord_t * target,const reiser4_key * key,reiser4_item_data * data,carry_plugin_info * info);
@@ -90,14 +97,12 @@ void update_item_key_node40(coord_t * ta carry_plugin_info * info);int kill_node40 (struct carry_kill_data *,carry_plugin_info *);int cut_node40 (struct carry_cut_data *,carry_plugin_info *); -int shift_node40 (coord_t * from,znode * to,shift_direction pend, -/* if @from->node becomes -empty - it will be deleted from -the tree if this is set to 1 -*/ +int shift_node40_common (coord_t *from,znode *to,shift_direction pend, +int delete_child,int including_stop_coord, +carry_plugin_info *info,size_t nh_size); +int shift_node40 (coord_t *from,znode *to,shift_direction pend,int delete_child,int including_stop_coord, -carry_plugin_info * info); - +carry_plugin_info *info);int fast_insert_node40 (const coord_t * coord);int fast_paste_node40 (const coord_t * coord);int fast_cut_node40 (const coord_t * coord);
fs/reiser4/plugin/node/node41.c new file +111 -0
111 lines not on this page · raw message
fs/reiser4/plugin/node/node41.h new file +48 -0
48 lines not on this page · raw message
fs/reiser4/plugin/plugin.h +1 -1
@@ -20,7 +20,7 @@#include "item/cde.h" #include "item/item.h" #include "node/node.h" -#include "node/node40.h" +#include "node/node41.h" #include "security/perm.h" #include "fibration.h"
fs/reiser4/reiser4.h +1 -0
@@ -1,6 +1,7 @@/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by * reiser4/README */ +/* definitions of common constants used by reiser4 */ #if !defined( __REISER4_H__ )
fs/reiser4/plugin/disk_format/disk_format40.c +6 -1
@@ -70,6 +70,11 @@ static __u32 get_format40_mkfs_id(constreturn le32_to_cpu (get_unaligned (&sb->mkfs_id)); } +static __u32 get_format40_node_plugin_id (const format40_disk_super_block * sb) +{ +return le32_to_cpu (get_unaligned (&sb->node_pid)); +} +static __u64 get_format40_flags (const format40_disk_super_block * sb) {return le64_to_cpu (get_unaligned (&sb->flags));
@@ -342,7 +347,7 @@ static int try_init_format40(struct supe/* get things necessary to init reiser4_tree */ root_block =get_format40_root_block (sb_copy); height =get_format40_tree_height (sb_copy); - nplug =node_plugin_by_id (NODE40_ID ); + nplug =node_plugin_by_id (get_format40_node_plugin_id (sb_copy));/* initialize reiser4_super_info_data */ sbinfo =get_super_private (super);
fs/reiser4/jnode.c +4 -7
@@ -839,16 +839,12 @@ static int jnode_start_read(jnode * nodestatic void check_jload (jnode * node,struct page *page) {if (jnode_is_znode (node)) { -node40_header *nh; -znode *z; +znode *z =JZNODE (node); - z =JZNODE (node);if (znode_is_any_locked (z)) { - nh = (node40_header *)kmap (page); -/* this only works for node40-only file systems. For -* debugging. */ assert ("nikita-3253" , - z->nr_items ==le16_to_cpu (get_unaligned (&nh->nr_items))); + z->nr_items == +node_plugin_by_node (z)->num_of_items (z));kunmap (page); }assert ("nikita-3565" ,znode_invariant (z));
@@ -1331,6 +1327,7 @@ static int init_znode(jnode * node) z =JZNODE (node);/* call node plugin to do actual initialization */ + z->nr_items =0 ;return z->nplug->init (z); }
fs/reiser4/plugin/disk_format/disk_format40.h +3 -1
@@ -57,7 +57,9 @@ typedef struct format40_disk_super_blockversion number supported by kernel. Is used by fsck to catch possible corruption and for various compatibility issues */ -/* 84 */ char not_used[428 ]; +/* 84 */ d32 node_pid; +/* node plugin id */ +/* 88 */ char not_used[424 ]; } format40_disk_super_block;/* format 40 specific part of reiser4_super_info_data */