mirror of https://github.com/vitalif/e2fsprogs
tune2fs: explicitly disallow tuning of journal devices
Spit out a more specific error if someone tries to modify an external journal device. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>crypto
parent
6aabb75493
commit
811bccef89
|
@ -2539,7 +2539,7 @@ retry_open:
|
||||||
if ((open_flag & EXT2_FLAG_RW) == 0 || f_flag)
|
if ((open_flag & EXT2_FLAG_RW) == 0 || f_flag)
|
||||||
open_flag |= EXT2_FLAG_SKIP_MMP;
|
open_flag |= EXT2_FLAG_SKIP_MMP;
|
||||||
|
|
||||||
open_flag |= EXT2_FLAG_64BITS;
|
open_flag |= EXT2_FLAG_64BITS | EXT2_FLAG_JOURNAL_DEV_OK;
|
||||||
|
|
||||||
/* keep the filesystem struct around to dump MMP data */
|
/* keep the filesystem struct around to dump MMP data */
|
||||||
open_flag |= EXT2_FLAG_NOFREE_ON_ERROR;
|
open_flag |= EXT2_FLAG_NOFREE_ON_ERROR;
|
||||||
|
@ -2569,6 +2569,12 @@ retry_open:
|
||||||
ext2fs_free(fs);
|
ext2fs_free(fs);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
if (EXT2_HAS_INCOMPAT_FEATURE(fs->super,
|
||||||
|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
|
||||||
|
fprintf(stderr, "%s", _("Cannot modify a journal device.\n"));
|
||||||
|
ext2fs_free(fs);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE;
|
fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE;
|
||||||
|
|
||||||
if (I_flag && !io_ptr_orig) {
|
if (I_flag && !io_ptr_orig) {
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
Creating filesystem with 4096 1k blocks and 0 inodes
|
||||||
|
Superblock backups stored on blocks:
|
||||||
|
|
||||||
|
Zeroing journal device:
|
||||||
|
tune2fs external journal
|
||||||
|
Cannot modify a journal device.
|
|
@ -0,0 +1 @@
|
||||||
|
tune2fs fail external journal
|
|
@ -0,0 +1,30 @@
|
||||||
|
FSCK_OPT=-fy
|
||||||
|
OUT=$test_name.log
|
||||||
|
if [ -f $test_dir/expect.gz ]; then
|
||||||
|
EXP=$test_name.tmp
|
||||||
|
gunzip < $test_dir/expect.gz > $EXP1
|
||||||
|
else
|
||||||
|
EXP=$test_dir/expect
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp /dev/null $OUT
|
||||||
|
|
||||||
|
$MKE2FS -F -o Linux -b 1024 -O journal_dev,metadata_csum -T ext4 $TMPFILE 4096 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
|
||||||
|
echo "tune2fs external journal" >> $OUT
|
||||||
|
$TUNE2FS -i 0 $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
|
||||||
|
|
||||||
|
rm -f $TMPFILE
|
||||||
|
|
||||||
|
cmp -s $OUT $EXP
|
||||||
|
status=$?
|
||||||
|
|
||||||
|
if [ "$status" = 0 ] ; then
|
||||||
|
echo "$test_name: $test_description: ok"
|
||||||
|
touch $test_name.ok
|
||||||
|
else
|
||||||
|
echo "$test_name: $test_description: failed"
|
||||||
|
diff $DIFF_OPTS $EXP $OUT > $test_name.failed
|
||||||
|
rm -f $test_name.tmp
|
||||||
|
fi
|
||||||
|
|
||||||
|
unset IMAGE FSCK_OPT OUT EXP
|
Loading…
Reference in New Issue