: add-reiserfs-specific-_check_reiserfs_filesystem patch
Hi,
I was on vacation last week.
I am using xfstests in my project and testing reiserfs filesystem. Reiserfsck waits for confirmation before fsck is runned. This patch runs reiserfsck with --yes parameter and confirmation is not needed.
Thanks
From f34d69cbbcdde9fa973e8c3ddb7fa3e9b17c7305 Mon Sep 17 00:00:00 2001
From: Jaroslav Barton <[email protected]>
Date: Fri, 4 Sep 2009 11:09:32 +0200
Subject: [PATCH] add reiserfs specific _check_reiserfs_filesystem function
The _check_generic_filesystem function doesn't start reiserfsck correctly. Reiserfsck waits for user answer (user must write Yes, but question is not visible). This specific function runs reiserfsck with --yes parameter to awoid waiting for answer.
--- common.rc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-)
common.rc +47 -0
@@ -911,6 +911,50 @@ _check_extN_filesystem() return 0 } +_check_reiserfs_filesystem() +{ + device=$1 + + # If type is set, we're mounted + type=`_fs_type $device` + ok=1 + + if [ "$type" = "$FSTYP" ] + then + # mounted ... + mountpoint=`_umount_or_remount_ro $device` + fi + + reiserfsck --yes $device >$tmp.fsck 2>&1 + if [ $? -ne 0 ] + then + echo "_check_reiserfs_filesystem: filesystem on $device is inconsistent (see $seq.full)" + + echo "_check_reiserfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full + echo "*** reiserfsck output ***" >>$here/$seq.full + cat $tmp.fsck >>$here/$seq.full + echo "*** end reiserfsck output" >>$here/$seq.full + + ok=0 + fi + rm -f $tmp.fsck + + if [ $ok -eq 0 ] + then + echo "*** mount output ***" >>$here/$seq.full + _mount >>$here/$seq.full + echo "*** end mount output" >>$here/$seq.full + elif [ "$type" = "$FSTYP" ] + then + # was mounted ... + _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint + ok=$? + fi + + [ $ok -eq 0 ] && exit 1 + return 0 +} + # run xfs_check and friends on a FS. _check_xfs_filesystem()
@@ -1082,6 +1126,9 @@ _check_test_fs() ext2|ext3|ext4) _check_extN_filesystem $TEST_DEV ;; + reiserfs) + _check_reiserfs_filesystem $TEST_DEV + ;; *) _check_generic_filesystem $TEST_DEV ;;
Signature · 1 line
1.6.2.5
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 7 lines · Jaroslav Barton
Hi,
I was on vacation last week.
I am using xfstests in my project and testing reiserfs filesystem. Reiserfsck waits for confirmation before fsck is runned. This patch runs reiserfsck with --yes parameter and confirmation is not needed.
I'd be much more happy if you would add a way to pass options to _check_generic_filesystem, e.g. by introducing a _fsck_opts machinery mirroring _mkfs_opts and _mount_opts. That would also clean up what Ted did in 8b61ae6352b1f92cc004a7349b90f39609c77a8f.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH 1/1 _check_generic_filesistem support for fsck parameters
_check_generic_filesystem now support fsck parameters. Fsck parameters can be passed by FSCK_OPTIONS environmental variable. Default values will be used if FSCK_OPTIONS is missing or empty (same mechanism as MOUNT_OPTIONS and MKFS_OPTIONS).
_check_extN_filesystem function is no longer needed, extN filesystem are properly handled by default values in _check_generic_filesystem.
--- common.rc | 70 ++++++++++++++---------------------------------------------- 1 files changed, 17 insertions(+), 53 deletions(-)
common.rc +17 -53
@@ -91,9 +91,25 @@ _mkfs_opts() esac } +_fsck_opts() +{ + case $FSTYP in + ext2|ext3|ext4) + export FSCK_OPTIONS="-nf" + ;; + reiserfs) + export FSCK_OPTIONS="--yes" + ;; + *) + export FSCK_OPTIONS="-n" + ;; + esac +} + [ -z "$FSTYP" ] && FSTYP=xfs [ -z "$MOUNT_OPTIONS" ] && _mount_opts [ -z "$MKFS_OPTIONS" ] && _mkfs_opts +[ -z "$FSCK_OPTIONS" ] && _fsck_opts # we need common.config
@@ -835,7 +851,7 @@ _check_generic_filesystem() mountpoint=`_umount_or_remount_ro $device` fi - fsck -t $FSTYP -n $device >$tmp.fsck 2>&1 + fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1 if [ $? -ne 0 ] then echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $seq.full)"
@@ -865,52 +881,6 @@ _check_generic_filesystem() return 0 } -# Check an ext2/3/4 filesystem -# -_check_extN_filesystem() -{ - device=$1 - - # If type is set, we're mounted - type=`_fs_type $device` - ok=1 - - if [ "$type" = "$FSTYP" ] - then - # mounted ... - mountpoint=`_umount_or_remount_ro $device` - fi - - e2fsck -nf $device >$tmp.fsck 2>&1 - if [ $? -ne 0 ] - then - echo "_check_extN_filesystem: filesystem on $device is inconsistent (see $seq.full)" - - echo "_check_extN filesystem: filesystem on $device is inconsistent" >>$here/$seq.full - echo "*** e2fsck output ***" >>$here/$seq.full - cat $tmp.fsck >>$here/$seq.full - echo "*** end e2fsck output" >>$here/$seq.full - - ok=0 - fi - rm -f $tmp.fsck - - if [ $ok -eq 0 ] - then - echo "*** mount output ***" >>$here/$seq.full - _mount >>$here/$seq.full - echo "*** end mount output" >>$here/$seq.full - elif [ "$type" = "$FSTYP" ] - then - # was mounted ... - _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint - ok=$? - fi - - [ $ok -eq 0 ] && exit 1 - return 0 -} - # run xfs_check and friends on a FS. _check_xfs_filesystem()
@@ -1079,9 +1049,6 @@ _check_test_fs() udf) # do nothing for now ;; - ext2|ext3|ext4) - _check_extN_filesystem $TEST_DEV - ;; *) _check_generic_filesystem $TEST_DEV ;;
@@ -1108,9 +1075,6 @@ _check_scratch_fs() nfs*) # Don't know how to check an NFS filesystem, yet. ;; - ext2|ext3|ext4) - _check_extN_filesystem $SCRATCH_DEV - ;; *) _check_generic_filesystem $SCRATCH_DEV ;;
Signature · 6 lines
1.6.2.5 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH] _check_generic_filesistem support for fsck parameters
Quoted 7 lines · Jaroslav Barton
_check_generic_filesystemnow support fsck parameters. Fsck parameters can be passed byFSCK_OPTIONSenvironmental variable. Default values will be used ifFSCK_OPTIONSis missing or empty (same mechanism asMOUNT_OPTIONSandMKFS_OPTIONS).
_check_extN_filesystemfunction is no longer needed, extN filesystem are properly handled by default values in_check_generic_filesystem.
Thanks, I've put this in.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs