dumpe2fs, debugfs, e2image: Add support for orphan file

Print inode number of orphan file in outputs, dump e2image file to
filesystem image.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index b00157940774bc8c61e86565df0deea85c32be16..f916deab8cea90e2f7c05e6373c53247900cd7c0 100644 (file)
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -183,6 +183,7 @@ static struct field_set_info super_fields[] = {
        { "lpf_ino", &set_sb.s_lpf_ino, NULL, 4, parse_uint },
        { "checksum_seed", &set_sb.s_checksum_seed, NULL, 4, parse_uint },
        { "encoding", &set_sb.s_encoding, NULL, 2, parse_encoding },
+       { "orphan_file_inum", &set_sb.s_orphan_file_inum, NULL, 4, parse_uint },
        { 0, 0, 0, 0 }
 };
 

diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 176bee0fd19fa118fa229dcc365e42df391f4d48..1762bc44cac49680439ad1b88cc961e866e0356e 100644 (file)
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -482,6 +482,9 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
        if (ext2fs_has_feature_casefold(sb))
                fprintf(f, "Character encoding:       %s\n",
                        e2p_encoding2str(sb->s_encoding));
+       if (ext2fs_has_feature_orphan_file(sb))
+               fprintf(f, "Orphan file inode:        %u\n",
+                       sb->s_orphan_file_inum);
 }
 
 void list_super (struct ext2_super_block * s)

diff --git a/misc/e2image.c b/misc/e2image.c
index 0053b51563bd053cd30a930814a3d23878a51468..2c1f3db337147150462dacfcb7fee1f6c1fe11ba 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -1370,7 +1370,8 @@ static void write_raw_image_file(ext2_filsys fs, int fd, int type, int flags,
                    ino == fs->super->s_journal_inum ||
                    ino == quota_type2inum(USRQUOTA, fs->super) ||
                    ino == quota_type2inum(GRPQUOTA, fs->super) ||
-                   ino == quota_type2inum(PRJQUOTA, fs->super)) {
+                   ino == quota_type2inum(PRJQUOTA, fs->super) ||
+                   ino == fs->super->s_orphan_file_inum) {
                        retval = ext2fs_block_iterate3(fs, ino,
                                        BLOCK_FLAG_READ_ONLY, block_buf,
                                        process_dir_block, &pb);