mirror of https://github.com/vitalif/e2fsprogs
libext2fs: create inlinedata symlinks
Add to ext2fs_symlink the ability to create inline data symlinks. [ Modified by tytso to add more logging to the test script ] Suggested-by: Pu Hou <houpu.hp@alibaba-inc.com> Cc: Pu Hou <houpu.hp@alibaba-inc.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>crypto
Darrick J. Wong
Theodore Ts'o
parent
aef977196a
commit
8a17df7195
|
|
@ -35,7 +35,7 @@ errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino,
|
|||
struct ext2_inode inode;
|
||||
ext2_ino_t scratch_ino;
|
||||
blk64_t blk;
|
||||
int fastlink;
|
||||
int fastlink, inlinelink;
|
||||
unsigned int target_len;
|
||||
char *block_buf = 0;
|
||||
|
||||
|
|
@ -77,15 +77,36 @@ errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino,
|
|||
memset(&inode, 0, sizeof(struct ext2_inode));
|
||||
inode.i_mode = LINUX_S_IFLNK | 0777;
|
||||
inode.i_uid = inode.i_gid = 0;
|
||||
ext2fs_iblk_set(fs, &inode, fastlink ? 0 : 1);
|
||||
inode.i_links_count = 1;
|
||||
ext2fs_inode_size_set(fs, &inode, target_len);
|
||||
/* The time fields are set by ext2fs_write_new_inode() */
|
||||
|
||||
inlinelink = !fastlink &&
|
||||
(fs->super->s_feature_incompat &
|
||||
EXT4_FEATURE_INCOMPAT_INLINE_DATA) &&
|
||||
(target_len < fs->blocksize);
|
||||
if (fastlink) {
|
||||
/* Fast symlinks, target stored in inode */
|
||||
strcpy((char *)&inode.i_block, target);
|
||||
} else if (inlinelink) {
|
||||
/* Try inserting an inline data symlink */
|
||||
inode.i_flags |= EXT4_INLINE_DATA_FL;
|
||||
retval = ext2fs_write_new_inode(fs, ino, &inode);
|
||||
if (retval)
|
||||
goto cleanup;
|
||||
retval = ext2fs_inline_data_set(fs, ino, &inode, target,
|
||||
target_len);
|
||||
if (retval) {
|
||||
inode.i_flags &= ~EXT4_INLINE_DATA_FL;
|
||||
inlinelink = 0;
|
||||
goto need_block;
|
||||
}
|
||||
retval = ext2fs_read_inode(fs, ino, &inode);
|
||||
if (retval)
|
||||
goto cleanup;
|
||||
} else {
|
||||
need_block:
|
||||
ext2fs_iblk_set(fs, &inode, 1);
|
||||
/* Slow symlinks, target stored in the first block */
|
||||
memset(block_buf, 0, fs->blocksize);
|
||||
strcpy(block_buf, target);
|
||||
|
|
@ -104,11 +125,14 @@ errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino,
|
|||
* number is assigned by write_new_inode, which means that the
|
||||
* operations using ino must come after it.
|
||||
*/
|
||||
retval = ext2fs_write_new_inode(fs, ino, &inode);
|
||||
if (inlinelink)
|
||||
retval = ext2fs_write_inode(fs, ino, &inode);
|
||||
else
|
||||
retval = ext2fs_write_new_inode(fs, ino, &inode);
|
||||
if (retval)
|
||||
goto cleanup;
|
||||
|
||||
if (!fastlink) {
|
||||
if (!fastlink && !inlinelink) {
|
||||
retval = ext2fs_bmap2(fs, ino, &inode, NULL, BMAP_SET, 0, NULL,
|
||||
&blk);
|
||||
if (retval)
|
||||
|
|
@ -139,7 +163,7 @@ errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino,
|
|||
/*
|
||||
* Update accounting....
|
||||
*/
|
||||
if (!fastlink)
|
||||
if (!fastlink && !inlinelink)
|
||||
ext2fs_block_alloc_stats2(fs, blk, +1);
|
||||
ext2fs_inode_alloc_stats2(fs, ino, +1, 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
mke2fs -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 test.img 1024
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
test_filesys: 11/128 files (0.0% non-contiguous), 441/1024 blocks
|
||||
Exit status is 0
|
||||
debugfs -R "symlink /l_30 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
debugfs -R "symlink /l_70 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
debugfs -R "symlink /l_500 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
debugfs -R "symlink /l_1023 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
debugfs -R "symlink /l_1024 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
ext2fs_symlink: Invalid argument passed to ext2 library
|
||||
symlink: Invalid argument passed to ext2 library
|
||||
debugfs -R "symlink /l_1500 /xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" test.img
|
||||
ext2fs_symlink: Invalid argument passed to ext2 library
|
||||
symlink: Invalid argument passed to ext2 library
|
||||
debugfs -R "stat /l_30" test.img
|
||||
Inode: 12 Type: symlink Mode: 0777 Flags: 0x0
|
||||
Generation: 0 Version: 0x00000000:00000000
|
||||
User: 0 Group: 0 Size: 31
|
||||
File ACL: 0 Directory ACL: 0
|
||||
Links: 1 Blockcount: 0
|
||||
Fragment: Address: 0 Number: 0 Size: 0
|
||||
Size of extra inode fields: 28
|
||||
Fast link dest: "/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
||||
debugfs -R "stat /l_70" test.img
|
||||
Inode: 13 Type: symlink Mode: 0777 Flags: 0x10000000
|
||||
Generation: 0 Version: 0x00000000:00000000
|
||||
User: 0 Group: 0 Size: 71
|
||||
File ACL: 0 Directory ACL: 0
|
||||
Links: 1 Blockcount: 0
|
||||
Fragment: Address: 0 Number: 0 Size: 0
|
||||
Size of extra inode fields: 28
|
||||
Extended attributes:
|
||||
system.data (11)
|
||||
Fast link dest: "/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
||||
debugfs -R "stat /l_500" test.img
|
||||
Inode: 14 Type: symlink Mode: 0777 Flags: 0x80000
|
||||
Generation: 0 Version: 0x00000000:00000000
|
||||
User: 0 Group: 0 Size: 501
|
||||
File ACL: 0 Directory ACL: 0
|
||||
Links: 1 Blockcount: 2
|
||||
Fragment: Address: 0 Number: 0 Size: 0
|
||||
Size of extra inode fields: 28
|
||||
EXTENTS:
|
||||
(0):153
|
||||
debugfs -R "stat /l_1023" test.img
|
||||
Inode: 15 Type: symlink Mode: 0777 Flags: 0x80000
|
||||
Generation: 0 Version: 0x00000000:00000000
|
||||
User: 0 Group: 0 Size: 1024
|
||||
File ACL: 0 Directory ACL: 0
|
||||
Links: 1 Blockcount: 2
|
||||
Fragment: Address: 0 Number: 0 Size: 0
|
||||
Size of extra inode fields: 28
|
||||
EXTENTS:
|
||||
(0):154
|
||||
debugfs -R "stat /l_1024" test.img
|
||||
/l_1024: File not found by ext2_lookup
|
||||
debugfs -R "stat /l_1500" test.img
|
||||
/l_1500: File not found by ext2_lookup
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
test_filesys: 15/128 files (0.0% non-contiguous), 443/1024 blocks
|
||||
Exit status is 0
|
||||
|
|
@ -0,0 +1 @@
|
|||
create fast, inlinedata, and regular symlinks
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
if test -x $DEBUGFS_EXE; then
|
||||
|
||||
FSCK_OPT=-yf
|
||||
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
|
||||
|
||||
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
|
||||
|
||||
echo mke2fs -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 test.img 1024 >> $OUT
|
||||
$MKE2FS -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 $TMPFILE 1024 2>&1 |
|
||||
sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
for i in 30 70 500 1023 1024 1500; do
|
||||
echo "debugfs -R \"symlink /l_$i /$(perl -e "print 'x' x $i;")\" test.img" >> $OUT
|
||||
$DEBUGFS -w -R "symlink /l_$i /$(perl -e "print 'x' x $i;")" $TMPFILE \
|
||||
2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
|
||||
done
|
||||
|
||||
for i in 30 70 500 1023 1024 1500; do
|
||||
echo "debugfs -R \"stat /l_$i\" test.img" >> $OUT
|
||||
$DEBUGFS -R "stat /l_$i" $TMPFILE 2>&1 | \
|
||||
sed -f $cmd_dir/filter.sed | grep -v "time: " >> $OUT
|
||||
done
|
||||
|
||||
/bin/cp $TMPFILE /tmp/foo.img
|
||||
|
||||
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
|
||||
status=$?
|
||||
echo Exit status is $status >> $OUT.new
|
||||
sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
|
||||
rm -f $OUT.new
|
||||
|
||||
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
|
||||
|
||||
else #if test -a -x $DEBUGFS_EXE; then
|
||||
echo "$test_name: $test_description: skipped"
|
||||
fi
|
||||
Loading…
Reference in New Issue