reiserfsprogs: Support for reiserfs 3.7
PATCH 1/1 reiserfsprogs: Support for reiserfs 3.7
This patch contains support for handling the new 3.7 feature extension.
Note that it does not actually implement *any* optional features, it just adds support for checking, debugging, and tuning them.
reiserfstune supports setting and clearing feature bits (with --force, since none are supported right now), converting between 3.6 and 3.7, and converting back to 3.6 provided none of the optional features are enabled.
--- debugreiserfs/pack.c | 4 fsck/fsck.h | 4 fsck/main.c | 48 ++++++++++- fsck/reiserfsck.8 | 12 ++ fsck/super.c | 154 ++++++++++++++++++++++++++++++++++- include/reiserfs_fs.h | 46 ++++++++++ include/reiserfs_lib.h | 8 + mkreiserfs/mkreiserfs.c | 38 ++++++-- reiserfscore/Makefile.am | 2 reiserfscore/feature.c | 104 ++++++++++++++++++++++++ reiserfscore/node_formats.c | 25 +++++ reiserfscore/prints.c | 44 +++++++++- reiserfscore/reiserfslib.c | 8 + tune/reiserfstune.8 | 11 ++ tune/tune.c | 190 ++++++++++++++++++++++++++++++++++++++++---- 15 files changed, 650 insertions(+), 48 deletions(-)
debugreiserfs/pack.c +2 -2
@@ -567,8 +567,8 @@ static void pack_frozen_data (reiserfs_f__u16 magic16;int sent_journal_start_magic =0 ;unsigned int i; - - if (is_reiserfs_jr_magic_string(fs->fs_ondisk_sb) && + + if (has_nonstandard_journal(fs->fs_ondisk_sb) && get_jp_journal_dev(sb_jp(fs->fs_ondisk_sb)) && !journal_device_name(fs)) { if (!user_confirmed (stderr,
fsck/fsck.h +3 -1
@@ -44,9 +44,10 @@ int main (int argc, char * argv []);#define FSCK_ROLLBACK_CHANGES 5#define FSCK_CLEAN_ATTRIBUTES 7#define FSCK_AUTO 8/* -a || -p specified */ +#define FSCK_FIX_FEATURES 9/* temporary */ -#define DO_TEST 9 +#define DO_TEST 10/* * options
@@ -483,6 +484,7 @@ int replay_journal (reiserfs_filsys_t *)/*pass1: rebuild super block*/ void rebuild_sb (reiserfs_filsys_t * fs,char * filename,struct fsck_data * data); +int check_features (reiserfs_filsys_t * fs); #define fsck_log(fmt, list...) \
fsck/main.c +46 -2
90 lines not on this page · raw message
fsck/reiserfsck.8 +11 -1
@@ -1,13 +1,14 @@ .\" -*- nroff -*- .\" Copyright 1996-2004 Hans Reiser. .\" -.TH REISERFSCK 8 "January 2009" "Reiserfsprogs-3.6.21" +.TH REISERFSCK 8 "November 2010" "Reiserfsprogs-3.6.21" .SH NAME reiserfsck \- The checking tool for the ReiserFS filesystem. .SH SYNOPSIS .B reiserfsck [ \fB-aprVy\fR ] [ \fB--rebuild-sb\fR | \fB--check\fR | \fB--fix-fixable\fR +| \fB--fix-features\fR | \fB--rebuild-tree\fR | \fB--clean-attributes\fR ] .\" [ \fB-i\fR | \fB--interactive\fR ] [ \fB-j\fR | \fB--journal\fR \fIdevice\fR ]
@@ -56,6 +57,15 @@ you only need this option if the \fB--ch zeroing invalid data-block pointers, correcting st_size and st_blocks for directories, and deleting invalid directory entries. .TP +.B --fix-features +This option checks the optional feature fields added in the 3.7 format. +This is used when reiserfsck refuses to run because there are features +indicated as used in the superblock that reiserfsck doesn't support. +This should only be used if you are certain that there is corruption +in the fields and that the features aren't actually in use. It will +offer to clear all unknown fields or allow the administrator to +choose which unknown features to clear specifically. +.TP .B --rebuild-tree This option rebuilds the entire filesystem tree using leaf nodes found on the device. Normally you only need this option if the
fsck/super.c +149 -5
211 lines not on this page · raw message
include/reiserfs_fs.h +44 -2
77 lines not on this page · raw message
include/reiserfs_lib.h +8 -0
@@ -223,8 +223,10 @@ int is_blocksize_correct (unsigned int bint is_reiserfs_3_5_magic_string (struct reiserfs_super_block * rs);int is_reiserfs_3_6_magic_string (struct reiserfs_super_block * rs);int is_reiserfs_jr_magic_string (struct reiserfs_super_block * rs); +int is_reiserfs_3_7_magic_string (struct reiserfs_super_block * rs);int does_look_like_super_block (struct reiserfs_super_block * rs);int is_any_reiserfs_magic_string (struct reiserfs_super_block * rs); +int has_nonstandard_journal (struct reiserfs_super_block * rs);int get_reiserfs_format (struct reiserfs_super_block * sb);int reiserfs_super_block_size (struct reiserfs_super_block * rs);/*int magic_2_version (struct reiserfs_super_block * rs);*/
@@ -409,4 +411,10 @@ int can_we_format_it (char * device_name }\ +/* features.c */ +int reiserfs_string_to_feature (char *string,int *compat_type, +unsigned int *mask); +const char *reiserfs_feature_to_string (int compat,unsigned int mask); +const char *reiserfs_features_to_string (int compat,unsigned int mask); +#endif /* REISERFSPROGS_LIB_H */
mkreiserfs/mkreiserfs.c +29 -9
@@ -71,7 +71,7 @@ static void print_usage_and_exit(void)" -h | --hash rupasov|tea|r5 hash function to use by default\n" " -u | --uuid UUID store UUID in the superblock\n" " -l | --label LABEL store LABEL in the superblock\n" -" --format 3.5|3.6 old 3.5 format or newer 3.6\n" +" --format 3.5|3.6|3.7 old 3.5, common 3.6, or newer 3.7 format\n" " -f | --force specified once, make mkreiserfs the whole\n" " disk, not block device or mounted partition;\n" " specified twice, do not ask for confirmation\n"
@@ -112,7 +112,8 @@ static void make_super_block (reiserfs_fset_sb_umount_state (fs->fs_ondisk_sb,FS_CLEANLY_UMOUNTED );set_sb_tree_height (fs->fs_ondisk_sb,2 );set_sb_hash_code (fs->fs_ondisk_sb, Hash); -if (fs->fs_format ==REISERFS_FORMAT_3_6 ) { +if (fs->fs_format ==REISERFS_FORMAT_3_6 || + fs->fs_format ==REISERFS_FORMAT_3_7 ) {#if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H )if (uuid_is_null (UUID ))uuid_generate (UUID );
@@ -308,6 +309,7 @@ static void make_root_block (reiserfs_fistatic void report (reiserfs_filsys_t * fs,char * j_filename) {// print_block (stdout, fs, fs->fs_super_bh); +const char *journal_prefix =NULL ;struct reiserfs_super_block * sb = (struct reiserfs_super_block *)(fs->fs_super_bh->b_data);
@@ -334,10 +336,21 @@ static void report (reiserfs_filsys_t *case REISERFS_FORMAT_3_6 :reiserfs_warning (stdout,"Format 3.6 with " );break ; +case REISERFS_FORMAT_3_7 : +reiserfs_warning (stdout,"Format 3.7 with " ); +if (get_jp_journal_dev (sb_jp (sb))) + journal_prefix ="non-" ; +else + journal_prefix ="" ; +break ; + } +if (!journal_prefix) { +if (is_reiserfs_jr_magic_string (sb)) + journal_prefix ="non-" ; +else + journal_prefix ="" ; } -if (is_reiserfs_jr_magic_string (sb)) -reiserfs_warning (stdout,"non-" ); -reiserfs_warning (stdout,"standard journal\n" ); +reiserfs_warning (stdout,"%sstandard journal\n" , journal_prefix);reiserfs_warning (stdout,"Count of blocks on the device: %u\n" ,get_sb_block_count (sb)); reiserfs_warning (stdout, "Number of blocks consumed by mkreiserfs "
@@ -384,7 +397,8 @@ static void report (reiserfs_filsys_t * get_sb_version (sb)); } -if (get_reiserfs_format (sb) ==REISERFS_FORMAT_3_6 ) { +if (get_reiserfs_format (sb) ==REISERFS_FORMAT_3_6 || +get_reiserfs_format (sb) ==REISERFS_FORMAT_3_7 ) {reiserfs_warning (stdout,"inode generation number: %u\n" ,get_sb_v2_inode_generation (sb));reiserfs_warning (stdout,"UUID: %U\n" , sb->s_uuid);
@@ -415,7 +429,9 @@ static void set_reiserfs_version (char * {if (!strcmp (str,"3.5" )) Format ="3.5" ; -else { +else if (!strcmp (str,"3.7" )) + Format ="3.7" ; +else { Format ="3.6" ;if (strcmp (str,"3.6" )) message("wrong reiserfs version specified. "
@@ -520,6 +536,9 @@ static int select_format (void)if (!strcmp (Format,"3.5" ))return REISERFS_FORMAT_3_5 ; +if (!strcmp (Format,"3.7" )) +return REISERFS_FORMAT_3_7 ; +if (strcmp (Format,"3.6" )) {message ("Unknown fromat %s specified\n" , Format);exit (1 );
@@ -754,8 +773,9 @@ int main (int argc, char **argv)/* these fill buffers (super block, first bitmap, root block) with reiserfs structures */ #if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H ) -if (!uuid_is_null (UUID ) && fs->fs_format !=REISERFS_FORMAT_3_6 ) { -reiserfs_warning (stderr,"UUID can be specified only with 3.6 format\n" ); +if (!uuid_is_null (UUID ) && (fs->fs_format !=REISERFS_FORMAT_3_6 || + fs->fs_format !=REISERFS_FORMAT_3_7 )) { +reiserfs_warning (stderr,"UUID can be specified only with 3.6 or 3.7 format\n" );return 1 ; }#endif
reiserfscore/Makefile.am +1 -1
@@ -1,5 +1,5 @@ noinst_LIBRARIES = libcore.a libcore_a_SOURCES = do_balan.c fix_node.c hashes.c ibalance.c lbalance.c prints.c \ -stree.c node_formats.c reiserfslib.c bitmap.c journal.c includes.h +stree.c node_formats.c reiserfslib.c bitmap.c journal.c includes.h feature.c
reiserfscore/feature.c new file +104 -0
104 lines not on this page · raw message
reiserfscore/node_formats.c +23 -2
@@ -223,6 +223,12 @@ int is_reiserfs_3_6_magic_string (struct strlen ( REISERFS_3_6_SUPER_MAGIC_STRING))); } +int is_reiserfs_3_7_magic_string (struct reiserfs_super_block * rs) +{ +return (!strncmp (rs->s_v1.s_magic,REISERFS_3_7_SUPER_MAGIC_STRING , +strlen (REISERFS_3_7_SUPER_MAGIC_STRING ))); +} +int is_reiserfs_jr_magic_string (struct reiserfs_super_block * rs) {
@@ -235,11 +241,22 @@ int is_any_reiserfs_magic_string (struct {if (is_reiserfs_3_5_magic_string (rs) ||is_reiserfs_3_6_magic_string (rs) || +is_reiserfs_3_7_magic_string (rs) ||is_reiserfs_jr_magic_string (rs))return 1 ;return 0 ; } +int has_nonstandard_journal (struct reiserfs_super_block * rs) +{ +if (is_reiserfs_jr_magic_string (rs)) +return 1 ; +if (is_reiserfs_3_7_magic_string (rs) && +get_jp_journal_dev (&rs->s_v1.sb_journal) !=0 ) +return 1 ; +return 0 ; +} +int get_reiserfs_format (struct reiserfs_super_block * sb) {
@@ -257,6 +274,9 @@ int get_reiserfs_format (struct reiserfs get_sb_version (sb) == REISERFS_FORMAT_3_6))return REISERFS_FORMAT_3_6 ; +if (is_reiserfs_3_7_magic_string (sb)) +return REISERFS_FORMAT_3_7 ; +return REISERFS_FORMAT_UNKNOWN ; }
@@ -268,6 +288,7 @@ int reiserfs_super_block_size (struct recase REISERFS_FORMAT_3_5 :return SB_SIZE_V1 ;case REISERFS_FORMAT_3_6 : +case REISERFS_FORMAT_3_7 :return SB_SIZE ; }reiserfs_panic ("Unknown format found" );
@@ -345,14 +366,14 @@ char * which_block (int code)/** */ int block_of_journal (reiserfs_filsys_t * fs,unsigned long block) { -if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb)) { +if (!has_nonstandard_journal (fs->fs_ondisk_sb)) {/* standard journal */ if (block >=get_journal_start_must (fs) && block <=get_journal_start_must (fs) +get_jp_journal_size (sb_jp (fs->fs_ondisk_sb)))return 1 ;return 0 ; } - +if (get_sb_reserved_for_journal (fs->fs_ondisk_sb))/* there is space reserved for the journal on the host device */ if (block >= get_journal_start_must (fs) &&
reiserfscore/prints.c +39 -5
78 lines not on this page · raw message
reiserfscore/reiserfslib.c +8 -0
@@ -274,6 +274,14 @@ reiserfs_filsys_t * reiserfs_create (chamemcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_6_SUPER_MAGIC_STRING ,strlen (REISERFS_3_6_SUPER_MAGIC_STRING ));break ; +case REISERFS_FORMAT_3_7 : +set_sb_oid_maxsize (fs->fs_ondisk_sb, + (block_size -SB_SIZE ) /sizeof (__u32) /2 *2 ); +/* sb_oid_cursize */ +/* sb_state */ +memcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_7_SUPER_MAGIC_STRING , +strlen (REISERFS_3_7_SUPER_MAGIC_STRING )); +break ; }if (!default_journal) memcpy (fs->fs_ondisk_sb->s_v1.s_magic, REISERFS_JR_SUPER_MAGIC_STRING,
tune/reiserfstune.8 +10 -1
@@ -1,7 +1,7 @@ .\" -*- nroff -*- .\" Copyright 1996-2004 Hans Reiser. .\" -.TH REISERFSTUNE 8 "January 2009" "Reiserfsprogs-3.6.21" +.TH REISERFSTUNE 8 "November 2010" "Reiserfsprogs-3.6.21" .SH NAME reiserfstune \- The tunning tool for the ReiserFS filesystem. .SH SYNOPSIS
@@ -22,6 +22,7 @@ reiserfstune \- The tunning tool for the [ \fB-C\fR | \fB--time-last-checked \fItimestamp\fR ] [ \fB-m\fR | \fB--max-mnt-count \fIcount\fR ] [ \fB-M\fR | \fB--mnt-count \fIcount\fR ] +[ \fB-O\fR | \fB--feature \fIfeature\fR ] .I device .SH DESCRIPTION \fBreiserfstune\fR is used for tuning the ReiserFS. It can change two journal
@@ -191,6 +192,14 @@ option, .BR fsck.reiserfs(8) will check the filesystem at the next reboot. +.TP +\fB-O\fR | \fB--feature \fIfeature\fR +Enable, or disable by prefixing +.B \- +to \fIfeature\fR, an optional filesystem feature. +Optional filesystem features may not be supported on all systems but allow +extended functionality beyond that offered by the standard format. +NOTE: This option is only available for v3.7 format filesystems. .SH POSSIBLE SCENARIOS OF USING REISERFSTUNE: 1. You have ReiserFS on /dev/hda1, and you wish to have it working with its journal on the device /dev/journal
tune/tune.c +173 -17
280 lines not on this page · raw message
Signature · 2 lines
Jeff Mahoney SUSE Labs
Jeff Mahoney wrote:
[...]
debugreiserfs/pack.c static void pack_frozen_data (reiserfs_f · line 572
Quoted 12 lines
debugreiserfs/pack.c +2
-2@@ -567,8 +567,8 @@ static void pack_frozen_data (reiserfs_f__u16 magic16;int sent_journal_start_magic =0 ;unsigned int i; - - if (is_reiserfs_jr_magic_string(fs->fs_ondisk_sb) && + + if (has_nonstandard_journal(fs->fs_ondisk_sb) &&
so, we don't need the above
Quoted 11 lines
debugreiserfs/pack.c +0
-0get_jp_journal_dev(sb_jp(fs->fs_ondisk_sb)) && !journal_device_name(fs)) {debugreiserfs/pack.c +0
-0if (!user_confirmed (stderr,fsck/fsck.h +1
-0@@ -44,9 +44,10 @@ int main (int argc, char * argv []);#define FSCK_ROLLBACK_CHANGES 5#define FSCK_CLEAN_ATTRIBUTES 7#define FSCK_AUTO 8/* -a || -p specified */ +#define FSCK_FIX_FEATURES 9
[...]
fsck/fsck.h static void clean_attributes (reiserfs_f · line 936
Quoted 8 lines
static void
rebuild_tree(reiserfs_filsys_t* fs) {fsck/fsck.h +1
-1@@ -917,7 +932,7 @@ static void clean_attributes (reiserfs_fexit (EXIT_USER ); } -if (get_reiserfs_format (fs->fs_ondisk_sb) !=REISERFS_FORMAT_3_6 ) { +if (get_reiserfs_format (fs->fs_ondisk_sb) <REISERFS_FORMAT_3_6 ) {
ok
Quoted 58 lines
fsck/fsck.h +30
-1fsck_progress ("Filesystems of 3_5 format do not support extended " "attributes.\n" );@@ -1078,6 +1093,30 @@ error:exit (EXIT_FATAL ); } +static int fix_features (reiserfs_filsys_t *fs) +{ +int ret =0 ; +/* Check feature bits. We shouldn't continue on a file system with +* feature bits we don't know about. OTOH, we can't really abort +* fsck entirely on a particular type of corruption. */ +if (is_reiserfs_3_7_magic_string (fs->fs_ondisk_sb)) { +int ret; +init_rollback_file (state_rollback_file (fs), &fs->fs_blocksize, +fsck_data (fs)->log); + +prepare_fs_for_check (fs); + + ret =check_features (fs); +reiserfs_close (fs); +if (ret) +exit (EXIT_FATAL ); +exit (EXIT_OK ); + }else { +fsck_progress ("Optional features are not supported on reiserfs formats prior to 3.7\n" ); + } +return ret; +} +/* check umounted or read-only mounted filesystems only */ static void check_fs (reiserfs_filsys_t * fs) {@@ -1357,7 +1396,8 @@ int main (int argc, char * argv [])exit (EXIT_OPER ); } } - + +if (data->options &BADBLOCKS_FILE ) {if (create_badblock_bitmap (fs, badblocks_file) !=0 )exit (EXIT_OPER );@@ -1371,6 +1411,10 @@ int main (int argc, char * argv [])case FSCK_SB :rebuild_sb (fs, file_name, data);break ; + +case FSCK_FIX_FEATURES : +fix_features (fs); +break ;case FSCK_AUTO :/* perform some light-weight checks. If error, do fixable job. */
fsck/reiserfsck.8 line 5
Quoted 6 lines
fsck/reiserfsck.8 +1
-1@@ -1,13 +1,14 @@ .\" -*- nroff -*- .\" Copyright 1996-2004 Hans Reiser. .\" -.TH REISERFSCK 8 "January 2009" "Reiserfsprogs-3.6.21" +.TH REISERFSCK 8 "November 2010" "Reiserfsprogs-3.6.21"
3.6.22?
Quoted 45 lines
fsck/reiserfsck.8 +1
-0.SH NAME reiserfsck \- The checking tool for the ReiserFS filesystem. .SH SYNOPSIS .B reiserfsck [ \fB-aprVy\fR ] [ \fB--rebuild-sb\fR | \fB--check\fR | \fB--fix-fixable\fR +| \fB--fix-features\fR | \fB--rebuild-tree\fR | \fB--clean-attributes\fR ] .\" [ \fB-i\fR | \fB--interactive\fR ][ \fB-j\fR | \fB--journal\fR \fIdevice\fR ]
fsck/reiserfsck.8 +9
-0@@ -56,6 +57,15 @@ you only need this option if the \fB--ch zeroing invalid data-block pointers, correcting st_size and st_blocks for directories, and deleting invalid directory entries. .TP +.B --fix-features +This option checks the optional feature fields added in the 3.7 format. +This is used when reiserfsck refuses to run because there are features +indicated as used in the superblock that reiserfsck doesn't support. +This should only be used if you are certain that there is corruption +in the fields and that the features aren't actually in use. It will +offer to clear all unknown fields or allow the administrator to +choose which unknown features to clear specifically. +.TP .B --rebuild-tree This option rebuilds the entire filesystem tree using leaf nodes found on the device. Normally you only need this option if thefsck/super.c +2
-1@@ -24,10 +24,11 @@ int what_fs_version ()"\t(2) >=3.5.9 (introduced in the middle of 1999) (if you use linux 2.2, choose this one)\n" "\t(3) < 3.5.9 converted to new format (don't choose if unsure)\n" "\t(4) < 3.5.9 (this is very old format, don't choose if unsure)\n" +"\t(5) 3.7.x\n" "\t(X) exit\n");getline (&answer, &n, stdin); version =atoi (answer); -if (version <1 || version >4 ) +if (version <1 || version >5 )die ("rebuild_sb: wrong version" );return version; }@@ -168,6 +169,129 @@ int check_sb (reiserfs_filsys_t * fs) {} */
[...]
Quoted 80 lines
fsck/super.c +24
-4@@ -228,7 +352,16 @@ void rebuild_sb (reiserfs_filsys_t * fs,memcpy (sb, fs->fs_ondisk_sb,sizeof (*sb)); fs->fs_ondisk_sb = sb; -if (is_reiserfs_3_6_magic_string (sb)) { +if (is_reiserfs_3_7_magic_string (sb)) { +/* 3_7 magic */ +if (fs->fs_super_bh->b_blocknr == +REISERFS_DISK_OFFSET_IN_BYTES / fs->fs_blocksize) + version =7 ; +else +reiserfs_exit (EXIT_USER ,"ReiserFS v3.7 was found but in " +"an invalid location.\n" ); + magic_was_found =7 ; + }else if (is_reiserfs_3_6_magic_string (sb)) {/* 3_6 magic */ if (fsck_data (fs)->journal_dev_name)/* journal dev must not be specified with standard journal */ @@ -295,7 +428,9 @@ void rebuild_sb (reiserfs_filsys_t * fs,if (magic_was_found ==1 || magic_was_found ==2 ) standard_journal =1 ; -else +else if (magic_was_found ==7 ) { + standard_journal = !fsck_data (fs)->journal_dev_name; + }else standard_journal =0 ;if (version ==0 )@@ -327,6 +462,7 @@ void rebuild_sb (reiserfs_filsys_t * fs, get_sb_block_size (sb), fs->fs_blocksize);set_sb_block_size (sb, fs->fs_blocksize); } + }/* if no reiserfs_found or bad data found in that SB, what was checked in previous @@ -375,6 +511,8 @@ void rebuild_sb (reiserfs_filsys_t * fs,case 4 : fs =reiserfs_create (filename,REISERFS_FORMAT_3_5 , block_count, retval,1 ,0 );break ; +case 7 : + fs =reiserfs_create (filename,REISERFS_FORMAT_3_7 , block_count, retval,1 , standard_journal); }if (fs ==NULL )@@ -435,6 +573,12 @@ void rebuild_sb (reiserfs_filsys_t * fs, get_reiserfs_format (sb), REISERFS_FORMAT_3_5);set_sb_version (sb,REISERFS_FORMAT_3_5 ); } + }else if (version ==7 && +get_reiserfs_format (sb) !=REISERFS_FORMAT_3_7 ) { +fsck_log ("rebuild-sb: wrong reiserfs version occured (%lu), " +"fixed (%lu)\n" ,get_reiserfs_format (sb), +REISERFS_FORMAT_3_7 ); +set_sb_version (sb,REISERFS_FORMAT_3_7 ); } p_oid_maxsize = (fs->fs_blocksize - reiserfs_super_block_size (sb)) /@@ -503,7 +647,7 @@ void rebuild_sb (reiserfs_filsys_t * fs,set_sb_hash_code (sb,0 ); } -if (version ==1 || version ==3 ) { +if (version ==1 || version ==3 || version ==7 ) {#if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H )if (uuid_is_null (sb->s_uuid)) {uuid_generate (sb->s_uuid);@@ -812,7 +956,7 @@ void rebuild_sb (reiserfs_filsys_t * fs,/* whether journal header contains params with the same dev, offset, size will be checked in open_journal */ -if (version ==1 || version ==3 ) +if (version ==1 || version ==3 || version ==7 ) sb_size =SB_SIZE ;else sb_size =SB_SIZE_V1 ;
include/reiserfs_fs.h struct reiserfs_super_block_v1 · line 189
Quoted 5 lines
include/reiserfs_fs.h +1
-0@@ -185,8 +185,8 @@ struct reiserfs_super_block_v1only reliable on filesystem with non-standard journal */ #define REISERFS_FORMAT_3_5 0#define REISERFS_FORMAT_3_6 2 +#define REISERFS_FORMAT_3_7 3
ok
Quoted 30 lines
include/reiserfs_fs.h +0
-1#define REISERFS_FORMAT_UNKNOWN -1 -/* values for sb_mount_state field */ #define
FS_CLEANLY_UMOUNTED1 /* this wasREISERFS_VALID_FS*/include/reiserfs_fs.h +9
-1@@ -206,7 +206,11 @@ struct reiserfs_super_block/*118 */ __u16 s_max_mnt_count;/*120 */ __u32 s_lastcheck;/*124 */ __u32 s_check_interval; -/*128 */ char s_unused[76 ] ;/* zero filled by mkreiserfs and reiserfs_convert_objectid_map_v1() +/* Only available in superblock v3/reiserfs 3.7 */ +/*128 */ __u32 s_feature_compat; +/*132 */ __u32 s_feature_incompat; +/*136 */ __u32 s_feature_ro_compat; +/*140 */ char s_unused[64 ] ;/* zero filled by mkreiserfs and reiserfs_convert_objectid_map_v1() * so any additions must be updated there as well. */ /*204*/ } __attribute__ ((__packed__));;@@ -293,6 +297,10 @@ typedef enum {#define set_sb_v2_flag (sb, flag) set_le32 (sb, s_flags, get_le32 (sb, s_flags) | flag)#define clear_sb_v2_flag (sb, flag) set_le32 (sb, s_flags, get_le32 (sb, s_flags) & ~(flag)) +#define get_sb_v2_feature_incompat (sb) get_le32 (sb, s_feature_incompat) +#define get_sb_v2_feature_compat (sb) get_le32 (sb, s_feature_compat) +#define get_sb_v2_feature_ro_compat (sb) get_le32 (sb, s_feature_ro_compat) +/* #define journal_is_relocated(sb) get_jp_journal_dev(sb_jp (sb)) */
include/reiserfs_fs.h typedef enum { · line 405
Quoted 5 lines
include/reiserfs_fs.h +1
-0@@ -393,6 +401,7 @@ typedef enum {#define REISERFS_3_6_SUPER_MAGIC_STRING "ReIsEr2Fs"#define REISERFS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"/* JR stands for Journal Relocation */ +#define REISERFS_3_7_SUPER_MAGIC_STRING "ReIsEr7Fs"
um.. already "7"? ok...
Quoted 46 lines
include/reiserfs_fs.h +33
-0#define get_reiserfs_ondisk_offset (block_of_super_block, block_size) \ (block_of_super_block * block_size)@@ -406,6 +415,39 @@ typedef enum { ((get_reiserfs_ondisk_offset (block_of_super_block,4096 ) ==REISERFS_OLD_DISK_OFFSET_IN_BYTES ) \ ?1 :0 ) +/* Features */ +/* reiserfs 3.7 features */ + +#define REISERFS_FEATURE_COMPAT 0 +#define REISERFS_FEATURE_INCOMPAT 1 +#define REISERFS_FEATURE_RO_COMPAT 2 + +#define REISERFS_HAS_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_compat & cpu_to_le32(mask)) +#define REISERFS_HAS_INCOMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_incompat & cpu_to_le32(mask)) +#define REISERFS_HAS_RO_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_ro_compat & cpu_to_le32(mask)) + +#define REISERFS_SET_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_compat |= cpu_to_le32(mask)) +#define REISERFS_SET_INCOMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_incompat |= cpu_to_le32(mask)) +#define REISERFS_SET_RO_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_ro_compat |= cpu_to_le32(mask)) + +#define REISERFS_CLEAR_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_compat &= ~cpu_to_le32(mask)) +#define REISERFS_CLEAR_INCOMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_incompat &= ~cpu_to_le32(mask)) +#define REISERFS_CLEAR_RO_COMPAT_FEATURE (sb, mask) \ + ((sb)->s_feature_ro_compat &= ~cpu_to_le32(mask)) + +#define REISERFS_FEATURE_COMPAT_SUPP 0 +#define REISERFS_FEATURE_INCOMPAT_SUPP 0 +#define REISERFS_FEATURE_RO_COMPAT_SUPP 0 + +/***************************************************************************/ /* JOURNAL */ /***************************************************************************/
include/reiserfs_lib.h int is_blocksize_correct (unsigned int b · line 230
Quoted 8 lines
include/reiserfs_lib.h +2
-0@@ -223,8 +223,10 @@ int is_blocksize_correct (unsigned int bint is_reiserfs_3_5_magic_string (struct reiserfs_super_block * rs);int is_reiserfs_3_6_magic_string (struct reiserfs_super_block * rs);int is_reiserfs_jr_magic_string (struct reiserfs_super_block * rs); +int is_reiserfs_3_7_magic_string (struct reiserfs_super_block * rs);int does_look_like_super_block (struct reiserfs_super_block * rs);int is_any_reiserfs_magic_string (struct reiserfs_super_block * rs); +int has_nonstandard_journal (struct reiserfs_super_block * rs);
don't need
Quoted 26 lines
include/reiserfs_lib.h +0
-0int get_reiserfs_format (struct reiserfs_super_block * sb);int reiserfs_super_block_size (struct reiserfs_super_block * rs);/*int
magic_2_version(structreiserfs_super_block* rs);*/include/reiserfs_lib.h +6
-0@@ -409,4 +411,10 @@ int can_we_format_it (char * device_name }\ +/* features.c */ +int reiserfs_string_to_feature (char *string,int *compat_type, +unsigned int *mask); +const char *reiserfs_feature_to_string (int compat,unsigned int mask); +const char *reiserfs_features_to_string (int compat,unsigned int mask); +#endif /* REISERFSPROGS_LIB_H */ mkreiserfs/mkreiserfs.c +1
-1@@ -71,7 +71,7 @@ static void print_usage_and_exit(void)" -h | --hash rupasov|tea|r5 hash function to use by default\n" " -u | --uuid UUID store UUID in the superblock\n" " -l | --label LABEL store LABEL in the superblock\n" -" --format 3.5|3.6 old 3.5 format or newer 3.6\n" +" --format 3.5|3.6|3.7 old 3.5, common 3.6, or newer 3.7 format\n" " -f | --force specified once, make mkreiserfs the whole\n" " disk, not block device or mounted partition;\n" " specified twice, do not ask for confirmation\n"
mkreiserfs/mkreiserfs.c static void make_super_block (reiserfs_f · line 117
Quoted 7 lines
mkreiserfs/mkreiserfs.c +2
-1@@ -112,7 +112,8 @@ static void make_super_block (reiserfs_fset_sb_umount_state (fs->fs_ondisk_sb,FS_CLEANLY_UMOUNTED );set_sb_tree_height (fs->fs_ondisk_sb,2 );set_sb_hash_code (fs->fs_ondisk_sb, Hash); -if (fs->fs_format ==REISERFS_FORMAT_3_6 ) { +if (fs->fs_format ==REISERFS_FORMAT_3_6 || + fs->fs_format ==REISERFS_FORMAT_3_7 ) {
ok
Quoted 24 lines
mkreiserfs/mkreiserfs.c +0
-0#if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H )if (uuid_is_null (UUID ))mkreiserfs/mkreiserfs.c +10
-0uuid_generate (UUID );@@ -308,6 +309,7 @@ static void make_root_block (reiserfs_fistatic void report (reiserfs_filsys_t * fs,char * j_filename) {// print_block (stdout, fs, fs->fs_super_bh); +const char *journal_prefix =NULL ;struct reiserfs_super_block * sb = (struct reiserfs_super_block *)(fs->fs_super_bh->b_data);@@ -334,10 +336,21 @@ static void report (reiserfs_filsys_t *case REISERFS_FORMAT_3_6 :reiserfs_warning (stdout,"Format 3.6 with " );break ; +case REISERFS_FORMAT_3_7 : +reiserfs_warning (stdout,"Format 3.7 with " ); +if (get_jp_journal_dev (sb_jp (sb))) + journal_prefix ="non-" ; +else + journal_prefix ="" ; +break ; + } +if (!journal_prefix) {
mkreiserfs/mkreiserfs.c static void report (reiserfs_filsys_t * · line 354
Quoted 10 lines
mkreiserfs/mkreiserfs.c +5
-3+if (is_reiserfs_jr_magic_string (sb)) + journal_prefix ="non-" ; +else + journal_prefix ="" ; } -if (is_reiserfs_jr_magic_string (sb)) -reiserfs_warning (stdout,"non-" ); -reiserfs_warning (stdout,"standard journal\n" ); +reiserfs_warning (stdout,"%sstandard journal\n" , journal_prefix);
so, we don't need all this "guess the prefix" stuff.. I think the common mnemonic rule is clear:
"update "3.x", and don't touch "jr""...
mkreiserfs/mkreiserfs.c static void report (reiserfs_filsys_t * · line 402
Quoted 11 lines
mkreiserfs/mkreiserfs.c +0
-0reiserfs_warning (stdout,"Count of blocks on the device: %u\n" ,get_sb_block_count (sb));
reiserfs_warning(stdout, "Number of blocks consumed by mkreiserfs "mkreiserfs/mkreiserfs.c +2
-1@@ -384,7 +397,8 @@ static void report (reiserfs_filsys_t * get_sb_version (sb)); } -if (get_reiserfs_format (sb) ==REISERFS_FORMAT_3_6 ) { +if (get_reiserfs_format (sb) ==REISERFS_FORMAT_3_6 || +get_reiserfs_format (sb) ==REISERFS_FORMAT_3_7 ) {
ok
Quoted 26 lines
mkreiserfs/mkreiserfs.c +0
-0reiserfs_warning (stdout,"inode generation number: %u\n" ,get_sb_v2_inode_generation (sb));reiserfs_warning (stdout, "UUID: %U\n", sb->s_uuid);mkreiserfs/mkreiserfs.c +6
-1@@ -415,7 +429,9 @@ static void set_reiserfs_version (char * {if (!strcmp (str,"3.5" )) Format ="3.5" ; -else { +else if (!strcmp (str,"3.7" )) + Format ="3.7" ; +else { Format ="3.6" ;if (strcmp (str,"3.6" )) message("wrong reiserfs version specified. "@@ -520,6 +536,9 @@ static int select_format (void)if (!strcmp (Format,"3.5" ))return REISERFS_FORMAT_3_5 ; +if (!strcmp (Format,"3.7" )) +return REISERFS_FORMAT_3_7 ; +if (strcmp (Format,"3.6" )) {message ("Unknown fromat %s specified\n" , Format);exit (1 );@@ -754,8 +773,9 @@ int main (int argc, char **argv)/* these fill buffers (super block, first bitmap, root block) with
mkreiserfs/mkreiserfs.c int main (int argc, char **argv) · line 781
Quoted 10 lines
mkreiserfs/mkreiserfs.c +3
-2reiserfs structures */ #if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H ) -if (!uuid_is_null (UUID ) && fs->fs_format !=REISERFS_FORMAT_3_6 ) { -reiserfs_warning (stderr,"UUID can be specified only with 3.6 format\n" ); +if (!uuid_is_null (UUID ) && (fs->fs_format !=REISERFS_FORMAT_3_6 || + fs->fs_format !=REISERFS_FORMAT_3_7 )) { +reiserfs_warning (stderr,"UUID can be specified only with 3.6 or 3.7 format\n" );return 1 ; }
ok
Quoted 10 lines
#endif
reiserfscore/Makefile.am +1
-1@@ -1,5 +1,5 @@ noinst_LIBRARIES = libcore.a libcore_a_SOURCES = do_balan.c fix_node.c hashes.c ibalance.c lbalance.c prints.c \ -stree.c node_formats.c reiserfslib.c bitmap.c journal.c includes.h +stree.c node_formats.c reiserfslib.c bitmap.c journal.c includes.h feature.c
[...]
Quoted 4 lines
reiserfscore/Makefile.am +1
-0+}
reiserfscore/node_formats.c int is_reiserfs_3_6_magic_string (struct · line 232
Quoted 10 lines
reiserfscore/node_formats.c +6
-0@@ -223,6 +223,12 @@ int is_reiserfs_3_6_magic_string (struct strlen ( REISERFS_3_6_SUPER_MAGIC_STRING))); } +int is_reiserfs_3_7_magic_string (struct reiserfs_super_block * rs) +{ +return (!strncmp (rs->s_v1.s_magic,REISERFS_3_7_SUPER_MAGIC_STRING , +strlen (REISERFS_3_7_SUPER_MAGIC_STRING ))); +} +
ok
reiserfscore/node_formats.c int is_any_reiserfs_magic_string (struct · line 248
Quoted 12 lines
reiserfscore/node_formats.c +1
-0int is_reiserfs_jr_magic_string (struct reiserfs_super_block * rs) {@@ -235,11 +241,22 @@ int is_any_reiserfs_magic_string (struct {if (is_reiserfs_3_5_magic_string (rs) ||is_reiserfs_3_6_magic_string (rs) || +is_reiserfs_3_7_magic_string (rs) ||is_reiserfs_jr_magic_string (rs))return 1 ;return 0 ;
ok
reiserfscore/node_formats.c int is_any_reiserfs_magic_string (struct · line 260
Quoted 13 lines
reiserfscore/node_formats.c +10
-0} +int has_nonstandard_journal (struct reiserfs_super_block * rs) +{ +if (is_reiserfs_jr_magic_string (rs)) +return 1 ; +if (is_reiserfs_3_7_magic_string (rs) && +get_jp_journal_dev (&rs->s_v1.sb_journal) !=0 ) +return 1 ; +return 0 ; +} +
don't need
reiserfscore/node_formats.c int get_reiserfs_format (struct reiserfs · line 280
Quoted 11 lines
reiserfscore/node_formats.c +0
-0int get_reiserfs_format (struct reiserfs_super_block * sb){
reiserfscore/node_formats.c +3
-0@@ -257,6 +274,9 @@ int get_reiserfs_format (struct reiserfs get_sb_version (sb) == REISERFS_FORMAT_3_6))return REISERFS_FORMAT_3_6 ; +if (is_reiserfs_3_7_magic_string (sb)) +return REISERFS_FORMAT_3_7 ; +
ok
Quoted 12 lines
reiserfscore/node_formats.c +1
-0return REISERFS_FORMAT_UNKNOWN ; }@@ -268,6 +288,7 @@ int reiserfs_super_block_size (struct recase REISERFS_FORMAT_3_5 :return SB_SIZE_V1 ;case REISERFS_FORMAT_3_6 : +case REISERFS_FORMAT_3_7 :return SB_SIZE ; }reiserfs_panic ("Unknown format found" );
reiserfscore/node_formats.c char * which_block (int code) · line 370
Quoted 6 lines
reiserfscore/node_formats.c +1
-1@@ -345,14 +366,14 @@ char * which_block (int code)/** */ int block_of_journal (reiserfs_filsys_t * fs,unsigned long block) { -if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb)) { +if (!has_nonstandard_journal (fs->fs_ondisk_sb)) {
don't need
Quoted 24 lines
reiserfscore/node_formats.c +1
-1/* standard journal */ if (block >=get_journal_start_must (fs) && block <=get_journal_start_must (fs) +get_jp_journal_size (sb_jp (fs->fs_ondisk_sb)))return 1 ;return 0 ; } - +if (get_sb_reserved_for_journal (fs->fs_ondisk_sb))/* there is space reserved for the journal on the host device */ reiserfscore/node_formats.c +0
-0if (block >= get_journal_start_must (fs) &&reiserfscore/prints.c +1
-0@@ -616,6 +616,7 @@ int print_super_block (FILE * fp, reiser__u16 state;time_t last_check =get_sb_v2_lastcheck (sb);char last_check_buf[26 ]; +const char *journal_prefix =NULL ;if (!does_look_like_super_block (sb))return 1 ;@@ -633,13 +634,25 @@ int print_super_block (FILE * fp, reiserreiserfs_warning (fp,"format 3.6 with " ); format =2 ;
reiserfscore/prints.c int print_super_block (FILE * fp, reiser · line 645
Quoted 10 lines
reiserfscore/prints.c +8
-0break ; +case REISERFS_FORMAT_3_7 : +reiserfs_warning (fp,"format 3.7 with " ); + format =2 ; +if (get_jp_journal_dev (&sb->s_v1.sb_journal)) + journal_prefix ="non-" ; +else + journal_prefix ="" ; +break ;
don't need
Quoted 5 lines
reiserfscore/prints.c +0
-1default :reiserfs_warning (fp,"unknown format with " );break ; } -if (is_reiserfs_jr_magic_string (sb))
reiserfscore/prints.c int print_super_block (FILE * fp, reiser
Quoted 10 lines
reiserfscore/prints.c +7
-2-reiserfs_warning (fp,"non-" ); -reiserfs_warning (fp,"standard journal\n" ); +if (!journal_prefix) { +if (is_reiserfs_jr_magic_string (sb)) + journal_prefix ="non-" ; +else + journal_prefix ="" ; + } +reiserfs_warning (fp,"%sstandard journal\n" , journal_prefix);
don't need
Quoted 111 lines
reiserfscore/prints.c +0
-0if (short_print) {reiserfscore/prints.c +23
-2reiserfs_warning (fp,"Blocks (total/free): %u/%u by %d bytes\n" ,get_sb_block_count (sb),get_sb_free_blocks (sb),get_sb_block_size (sb));@@ -677,7 +690,7 @@ int print_super_block (FILE * fp, reiserreiserfs_warning (fp,"\tI/O corruptions exist.\n" );reiserfs_warning (fp,"sb_version: %u\n" ,get_sb_version (sb)); -if (format ==2 ) { +if (get_reiserfs_format (sb) >=REISERFS_FORMAT_3_6 ) {reiserfs_warning (fp,"inode generation number: %u\n" ,get_sb_v2_inode_generation (sb));reiserfs_warning (fp,"UUID: %U\n" , sb->s_uuid);reiserfs_warning (fp,"LABEL: %.16s\n" , sb->s_label);@@ -710,6 +723,26 @@ int print_super_block (FILE * fp, reiserelse reiserfs_warning (fp,"Disabled. Run fsck.reiserfs(8) or use tunefs.reiserfs(8) to enable.\n" ); } +if (get_reiserfs_format (sb) ==REISERFS_FORMAT_3_7 ) { +const char *features; + features =reiserfs_features_to_string (REISERFS_FEATURE_INCOMPAT , +get_sb_v2_feature_incompat (sb)); +if (!features[0 ]) + features ="(none)" ; +reiserfs_warning (fp,"Incompatible features: %s\n" , features); + + features =reiserfs_features_to_string (REISERFS_FEATURE_RO_COMPAT , +get_sb_v2_feature_ro_compat (sb)); +if (!features[0 ]) + features ="(none)" ; +reiserfs_warning (fp,"RO-compatible features: %s\n" , features); + + features =reiserfs_features_to_string (REISERFS_FEATURE_COMPAT , +get_sb_v2_feature_compat (sb)); +if (!features[0 ]) + features ="(none)" ; +reiserfs_warning (fp,"Compatible features: %s\n" , features); + }return 0 ; }@@ -983,7 +1016,8 @@ void print_objectid_map (FILE * fp, reis sb = fs->fs_ondisk_sb; -if (fs->fs_format ==REISERFS_FORMAT_3_6 ) +if (fs->fs_format ==REISERFS_FORMAT_3_6 || + fs->fs_format ==REISERFS_FORMAT_3_7 ) omap = (__u32 *)(sb +1 );else if (fs->fs_format ==REISERFS_FORMAT_3_5 ) omap = (__u32 *)((struct reiserfs_super_block_v1 *)sb +1 );reiserfscore/reiserfslib.c +8
-0@@ -274,6 +274,14 @@ reiserfs_filsys_t * reiserfs_create (chamemcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_6_SUPER_MAGIC_STRING ,strlen (REISERFS_3_6_SUPER_MAGIC_STRING ));break ; +case REISERFS_FORMAT_3_7 : +set_sb_oid_maxsize (fs->fs_ondisk_sb, + (block_size -SB_SIZE ) /sizeof (__u32) /2 *2 ); +/* sb_oid_cursize */ +/* sb_state */ +memcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_7_SUPER_MAGIC_STRING , +strlen (REISERFS_3_7_SUPER_MAGIC_STRING )); +break ; }if (!default_journal) memcpy (fs->fs_ondisk_sb->s_v1.s_magic, REISERFS_JR_SUPER_MAGIC_STRING,tune/reiserfstune.8 +10
-1@@ -1,7 +1,7 @@ .\" -*- nroff -*- .\" Copyright 1996-2004 Hans Reiser. .\" -.TH REISERFSTUNE 8 "January 2009" "Reiserfsprogs-3.6.21" +.TH REISERFSTUNE 8 "November 2010" "Reiserfsprogs-3.6.21" .SH NAME reiserfstune \- The tunning tool for the ReiserFS filesystem. .SH SYNOPSIS@@ -22,6 +22,7 @@ reiserfstune \- The tunning tool for the [ \fB-C\fR | \fB--time-last-checked \fItimestamp\fR ] [ \fB-m\fR | \fB--max-mnt-count \fIcount\fR ] [ \fB-M\fR | \fB--mnt-count \fIcount\fR ] +[ \fB-O\fR | \fB--feature \fIfeature\fR ] .I device .SH DESCRIPTION \fBreiserfstune\fR is used for tuning the ReiserFS. It can change two journal@@ -191,6 +192,14 @@ option, .BR fsck.reiserfs(8) will check the filesystem at the next reboot. +.TP +\fB-O\fR | \fB--feature \fIfeature\fR +Enable, or disable by prefixing +.B \- +to \fIfeature\fR, an optional filesystem feature. +Optional filesystem features may not be supported on all systems but allow +extended functionality beyond that offered by the standard format. +NOTE: This option is only available for v3.7 format filesystems. .SH POSSIBLE SCENARIOS OF USING REISERFSTUNE: 1. You have ReiserFS on /dev/hda1, and you wish to have it working with its journal on the device /dev/journaltune/tune.c +1
-0@@ -67,6 +67,7 @@ static void print_usage_and_exit(void)" -M | --mnt-count\t\tset the number of times the filesystem\n" " \t\thas been mounted\n" " -h | --help\t\t\tprint help and exit\n" +" -O | --feature\t\t\tenable or disable (with -feature) feature\n" " -V\t\t\t\tprint version and exit\n", program_name);exit (1 ); }
tune/tune.c char * badblocks_file; · line 94
Quoted 7 lines
tune/tune.c +2
-1@@ -88,7 +89,8 @@ char * badblocks_file;/* If specified paramenters defines the standard journal, make it standard. */ static int should_make_journal_standard (reiserfs_filsys_t * fs,char * j_new_dev_name) { -if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb)) +if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb) && + !is_reiserfs_3_7_magic_string (fs->fs_ondisk_sb))
don't need
Quoted 134 lines
tune/tune.c +0
-0return 0 ;/* if (!user_confirmed (stderr, "ATTENTION! Filesystem with non-standard journal "
tune/tune.c +84
-3@@ -131,12 +133,15 @@ static int set_standard_journal_params (/* ondisk superblock update */ -if (get_sb_version (fs->fs_ondisk_sb) ==0 ) +if (get_sb_version (fs->fs_ondisk_sb) ==REISERFS_FORMAT_3_5 )memcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_5_SUPER_MAGIC_STRING ,strlen (REISERFS_3_5_SUPER_MAGIC_STRING )); -else if (get_sb_version (fs->fs_ondisk_sb) ==2 ) +else if (get_sb_version (fs->fs_ondisk_sb) ==REISERFS_FORMAT_3_6 )memcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_6_SUPER_MAGIC_STRING ,strlen (REISERFS_3_6_SUPER_MAGIC_STRING )); +else if (get_sb_version (fs->fs_ondisk_sb) ==REISERFS_FORMAT_3_7 ) +memcpy (fs->fs_ondisk_sb->s_v1.s_magic,REISERFS_3_7_SUPER_MAGIC_STRING , +strlen (REISERFS_3_7_SUPER_MAGIC_STRING ));else {message ("Can not set standard reiserfs magic: unknown format found %u," " try reiserfsck first" ,get_sb_version (fs->fs_ondisk_sb));@@ -250,6 +255,73 @@ static void set_mnt_count(char *str) Mnt_count =str2int (str); } +char features[3 ][32 ]; +unsigned int features_ok_to_set[3 ] = { + [REISERFS_FEATURE_INCOMPAT ] =REISERFS_FEATURE_INCOMPAT_SUPP , + [REISERFS_FEATURE_RO_COMPAT ] =REISERFS_FEATURE_RO_COMPAT_SUPP , + [REISERFS_FEATURE_COMPAT ] =REISERFS_FEATURE_COMPAT_SUPP , +}; + +unsigned int features_ok_to_clear[3 ] = { + [REISERFS_FEATURE_INCOMPAT ] =0 , + [REISERFS_FEATURE_RO_COMPAT ] =0 , + [REISERFS_FEATURE_COMPAT ] =0 , +}; + +static void set_features (char *str) +{ +char *feature; +while ((feature =strsep (&str,"," ))) { +int compat; +unsigned int mask; +int fnum; +int ret; +int neg =0 ; +if (feature[0 ] =='-' ) { + neg =1 ; + feature++; + } + + ret =reiserfs_string_to_feature (feature, &compat, &mask); +if (ret) { +printf ("Invalid feature name %s\n" , feature); +continue ; + } +for (fnum =0 ; mask >>=1 ; fnum++); + + features[compat][fnum] = neg ?2 :1 ; + +if (Force) +continue ; +if (neg && !(features_ok_to_clear[compat] & mask)) { +message ("Feature %s is not allowed to be cleared\n" , + feature); +exit (1 ); + }else if (!neg && !(features_ok_to_set[compat] & mask)) { +message ("Feature %s is not allowed to be set\n" , + feature); +exit (1 ); + } + } +} + +int Convert; +int Convert_format; +static void set_convert (char *str) +{ + Convert =1 ; +if (!strcmp (str,"3.7" )) + Convert_format =REISERFS_FORMAT_3_7 ; +else if (!strcmp (str,"3.6" )) + Convert_format =REISERFS_FORMAT_3_6 ; +else if (!strcmp (str,"3.5" )) + Convert_format =REISERFS_FORMAT_3_5 ; +else { +message ("Invalid format \"%s\" specified. Exiting.\n" , str); +exit (1 ); + } +} +static void set_check_interval (char *str) {if (!strcmp (str,"disable" ))@@ -380,6 +452,7 @@ int main (int argc, char **argv)struct reiserfs_journal_header * j_head;reiserfs_trans_t old, new;int Is_journal_or_maxtrans_size_specified =0 ; +int need_dirty =0 ; program_name =strrchr ( argv[0 ],'/' );@@ -417,11 +490,13 @@ int main (int argc, char **argv) {"time-last-checked", required_argument, 0, 'C'}, {"max-mount-count", required_argument, 0, 'm'}, {"mount-count", required_argument, 0, 'M'}, + {"feature", required_argument, 0, 'O'}, + {"convert", required_argument, 0, 'Z'}, {0, 0, 0, 0} };int option_index; - c =getopt_long (argc, argv,"hj:s:t:o:fu:l:b:B:Vc:C:m:M:" , + c =getopt_long (argc, argv,"hj:s:t:o:fu:l:b:B:Vc:C:m:M:O:" , options, &option_index);if (c ==-1 )break ;@@ -511,6 +586,14 @@ int main (int argc, char **argv)case 'M' :set_mnt_count (optarg);break ; +case 'O' : +set_features (optarg); +break ; + +case 'Z' : +set_convert (optarg); +break ; +#if 0 case 'J' :/* --journal-new-device */
tune/tune.c int main (int argc, char **argv) · line 721
Quoted 8 lines
tune/tune.c +2
-2@@ -633,8 +716,8 @@ int main (int argc, char **argv) }/* set UUID and LABEL if specified */ -if (fs->fs_format ==REISERFS_FORMAT_3_6 ) { -int need_dirty =0 ; +if (fs->fs_format ==REISERFS_FORMAT_3_6 || + fs->fs_format ==REISERFS_FORMAT_3_7 ) {
ok
Quoted 18 lines
tune/tune.c +0
-0#if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H )if (!uuid_is_null (UUID )) {tune/tune.c +0
-4memcpy (fs->fs_ondisk_sb->s_uuid,UUID ,16 );@@ -677,10 +760,6 @@ int main (int argc, char **argv) need_dirty =1 ; } -if (need_dirty) { -mark_buffer_dirty (fs->fs_super_bh); - fs->fs_dirt =1 ; - } }else {#if defined(HAVE_LIBUUID ) && defined(HAVE_UUID_UUID_H )if (!uuid_is_null (UUID ))@@ -695,6 +774,83 @@ int main (int argc, char **argv)reiserfs_exit (1 ,"check-interval cannot be specified for 3.5 format\n" ); }
[...]
tune/tune.c int main (int argc, char **argv) · line 920
Quoted 9 lines
tune/tune.c +1
-2@@ -759,15 +915,13 @@ int main (int argc, char **argv)/* we have to put journal on main device. It is only possible if there is enough space reserved by mkreiserfs */ -if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb)) -/* standard journal */ +if (!has_nonstandard_journal (fs->fs_ondisk_sb)) reserved =get_jp_journal_size (sb_jp (fs->fs_ondisk_sb)) +1 ;
don't need
Quoted 12 lines
tune/tune.c +2
-3else -/* non-standard journal */ reserved =get_sb_reserved_for_journal (fs->fs_ondisk_sb); - + journal_size = Journal_size; - +if (!journal_size) { journal_size =journal_default_size (fs->fs_super_bh->b_blocknr, fs->fs_blocksize) +1 ;tune/tune.c +0
-0message("Journal size has not been specified. Assuming it is the default size (%lu)",
tune/tune.c int main (int argc, char **argv) · line 949
Quoted 6 lines
tune/tune.c +1
-1@@ -791,7 +945,7 @@ int main (int argc, char **argv)message ("Current journal parameters:" );print_journal_params (stdout,sb_jp (fs->fs_ondisk_sb)); -if (!is_reiserfs_jr_magic_string (fs->fs_ondisk_sb)) { +if (!has_nonstandard_journal (fs->fs_ondisk_sb)) {
don't need
Quoted 5 lines
tune/tune.c +0
-0/* we have standard journal, so check if we can convert it to non-standard one */
tune/tune.c int main (int argc, char **argv) · line 964
Quoted 10 lines
tune/tune.c +3
-1@@ -802,7 +956,9 @@ int main (int argc, char **argv)} */ -if (is_reiserfs_3_6_magic_string (fs->fs_ondisk_sb)) +if (is_reiserfs_3_7_magic_string (fs->fs_ondisk_sb)) +set_sb_version (fs->fs_ondisk_sb,REISERFS_FORMAT_3_7 ); +else if (is_reiserfs_3_6_magic_string (fs->fs_ondisk_sb))set_sb_version (fs->fs_ondisk_sb,REISERFS_FORMAT_3_6 );else if (is_reiserfs_3_5_magic_string (fs->fs_ondisk_sb))set_sb_version (fs->fs_ondisk_sb,REISERFS_FORMAT_3_5 );
ok