mirror of https://github.com/vitalif/e2fsprogs
libext2fs: file IO routines should handle uninit blocks
The file IO routines do not handle uninit blocks at all. The read method should check for the uninit flag and return a buffer of zeroes, and the write routine should convert unwritten extents. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>crypto
parent
3548bb64b5
commit
dc7b8dad99
|
@ -123,6 +123,8 @@ errcode_t ext2fs_file_flush(ext2_file_t file)
|
||||||
{
|
{
|
||||||
errcode_t retval;
|
errcode_t retval;
|
||||||
ext2_filsys fs;
|
ext2_filsys fs;
|
||||||
|
int ret_flags;
|
||||||
|
blk64_t dontcare;
|
||||||
|
|
||||||
EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
|
EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
|
||||||
fs = file->fs;
|
fs = file->fs;
|
||||||
|
@ -131,6 +133,22 @@ errcode_t ext2fs_file_flush(ext2_file_t file)
|
||||||
!(file->flags & EXT2_FILE_BUF_DIRTY))
|
!(file->flags & EXT2_FILE_BUF_DIRTY))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
/* Is this an uninit block? */
|
||||||
|
if (file->physblock && file->inode.i_flags & EXT4_EXTENTS_FL) {
|
||||||
|
retval = ext2fs_bmap2(fs, file->ino, &file->inode, BMAP_BUFFER,
|
||||||
|
0, file->blockno, &ret_flags, &dontcare);
|
||||||
|
if (retval)
|
||||||
|
return retval;
|
||||||
|
if (ret_flags & BMAP_RET_UNINIT) {
|
||||||
|
retval = ext2fs_bmap2(fs, file->ino, &file->inode,
|
||||||
|
BMAP_BUFFER, BMAP_SET,
|
||||||
|
file->blockno, 0,
|
||||||
|
&file->physblock);
|
||||||
|
if (retval)
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OK, the physical block hasn't been allocated yet.
|
* OK, the physical block hasn't been allocated yet.
|
||||||
* Allocate it.
|
* Allocate it.
|
||||||
|
@ -185,15 +203,17 @@ static errcode_t load_buffer(ext2_file_t file, int dontfill)
|
||||||
{
|
{
|
||||||
ext2_filsys fs = file->fs;
|
ext2_filsys fs = file->fs;
|
||||||
errcode_t retval;
|
errcode_t retval;
|
||||||
|
int ret_flags;
|
||||||
|
|
||||||
if (!(file->flags & EXT2_FILE_BUF_VALID)) {
|
if (!(file->flags & EXT2_FILE_BUF_VALID)) {
|
||||||
retval = ext2fs_bmap2(fs, file->ino, &file->inode,
|
retval = ext2fs_bmap2(fs, file->ino, &file->inode,
|
||||||
BMAP_BUFFER, 0, file->blockno, 0,
|
BMAP_BUFFER, 0, file->blockno, &ret_flags,
|
||||||
&file->physblock);
|
&file->physblock);
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
if (!dontfill) {
|
if (!dontfill) {
|
||||||
if (file->physblock) {
|
if (file->physblock &&
|
||||||
|
!(ret_flags & BMAP_RET_UNINIT)) {
|
||||||
retval = io_channel_read_blk64(fs->io,
|
retval = io_channel_read_blk64(fs->io,
|
||||||
file->physblock,
|
file->physblock,
|
||||||
1, file->buf);
|
1, file->buf);
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
cat a file with uninit blocks
|
|
@ -0,0 +1,37 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if test -x $DEBUGFS_EXE; then
|
||||||
|
FSCK_OPT=-fy
|
||||||
|
IMAGE=$test_dir/image.gz
|
||||||
|
|
||||||
|
gzip -d < $IMAGE > $TMPFILE
|
||||||
|
#e2label $TMPFILE test_filesys
|
||||||
|
|
||||||
|
# Run fsck to fix things?
|
||||||
|
EXP=$test_dir/expect
|
||||||
|
OUT=$test_name.log
|
||||||
|
rm -rf $test_name.failed $test_name.ok
|
||||||
|
|
||||||
|
$FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
|
||||||
|
echo "Exit status is $?" >> $OUT
|
||||||
|
|
||||||
|
echo "debugfs cat uninit file" >> $OUT
|
||||||
|
echo "ex /a" > $TMPFILE.cmd
|
||||||
|
echo "cat /a" >> $TMPFILE.cmd
|
||||||
|
$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
|
||||||
|
echo >> $OUT.new
|
||||||
|
sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
|
||||||
|
rm -rf $OUT.new $TMPFILE
|
||||||
|
|
||||||
|
# Figure out what happened
|
||||||
|
if cmp -s $EXP $OUT; then
|
||||||
|
echo "$test_name: $test_description: ok"
|
||||||
|
touch $test_name.ok
|
||||||
|
else
|
||||||
|
echo "$test_name: $test_description: failed"
|
||||||
|
diff -u $EXP $OUT >> $test_name.failed
|
||||||
|
fi
|
||||||
|
unset EXP OUT FSCK_OPT IMAGE
|
||||||
|
else #if test -a -x $DEBUGFS_EXE; then
|
||||||
|
echo "$test_name: $test_description: skipped"
|
||||||
|
fi
|
Loading…
Reference in New Issue