po: update ms.po (from translationproject.org)

[tools/e2fsprogs.git] / debugfs / logdump.c

diff --git a/debugfs/logdump.c b/debugfs/logdump.c
index b747a92..6aee1a1 100644 (file)
--- a/debugfs/logdump.c
+++ b/debugfs/logdump.c
@@ -159,6 +159,7 @@ void do_logdump(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
                if (!inode_to_dump)
                        return;
 
+               es = current_fs->super;
                inode_group = ((inode_to_dump - 1)
                               / es->s_inodes_per_group);
                group_offset = ((inode_to_dump - 1)
@@ -189,7 +190,10 @@ void do_logdump(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
                }
        }
 
-       if (block_to_dump != ANY_BLOCK && current_fs != NULL) {
+       if (block_to_dump != ANY_BLOCK) {
+               if (check_fs_open(argv[0]))
+                       goto cleanup;
+               es = current_fs->super;
                group_to_dump = ((block_to_dump -
                                  es->s_first_data_block)
                                 / es->s_blocks_per_group);
@@ -547,24 +551,28 @@ static inline size_t journal_super_tag_bytes(journal_superblock_t *jsb)
 static void dump_fc_block(FILE *out_file, char *buf, int blocksize,
        int transaction, int *fc_done, int dump_old)
 {
-       struct ext4_fc_tl       *tl;
+       struct ext4_fc_tl       tl;
        struct ext4_fc_head     *head;
        struct ext4_fc_add_range        *add_range;
        struct ext4_fc_del_range        *del_range;
        struct ext4_fc_dentry_info      *dentry_info;
        struct ext4_fc_tail             *tail;
        struct ext3_extent      *ex;
+       __u8                    *cur, *val;
 
        *fc_done = 0;
-       fc_for_each_tl(buf, buf + blocksize, tl) {
-               switch (le16_to_cpu(tl->fc_tag)) {
+       for (cur = (__u8 *)buf; cur < (__u8 *)buf + blocksize;
+            cur = cur + sizeof(tl) + le16_to_cpu(tl.fc_len)) {
+               memcpy(&tl, cur, sizeof(tl));
+               val = cur + sizeof(tl);
+
+               switch (le16_to_cpu(tl.fc_tag)) {
                case EXT4_FC_TAG_ADD_RANGE:
-                       add_range =
-                               (struct ext4_fc_add_range *)ext4_fc_tag_val(tl);
+                       add_range = (struct ext4_fc_add_range *)val;
                        ex = (struct ext3_extent *)add_range->fc_ex;
                        fprintf(out_file,
                                "tag %s, inode %d, lblk %u, pblk %llu, len %lu\n",
-                               tag2str(tl->fc_tag),
+                               tag2str(tl.fc_tag),
                                le32_to_cpu(add_range->fc_ino),
                                le32_to_cpu(ex->ee_block),
                                le32_to_cpu(ex->ee_start) +
@@ -574,10 +582,9 @@ static void dump_fc_block(FILE *out_file, char *buf, int blocksize,
                                le16_to_cpu(ex->ee_len));
                        break;
                case EXT4_FC_TAG_DEL_RANGE:
-                       del_range =
-                               (struct ext4_fc_del_range *)ext4_fc_tag_val(tl);
+                       del_range = (struct ext4_fc_del_range *)val;
                        fprintf(out_file, "tag %s, inode %d, lblk %d, len %d\n",
-                               tag2str(tl->fc_tag),
+                               tag2str(tl.fc_tag),
                                le32_to_cpu(del_range->fc_ino),
                                le32_to_cpu(del_range->fc_lblk),
                                le32_to_cpu(del_range->fc_len));
@@ -585,29 +592,26 @@ static void dump_fc_block(FILE *out_file, char *buf, int blocksize,
                case EXT4_FC_TAG_LINK:
                case EXT4_FC_TAG_UNLINK:
                case EXT4_FC_TAG_CREAT:
-                       dentry_info =
-                               (struct ext4_fc_dentry_info *)
-                                       ext4_fc_tag_val(tl);
+                       dentry_info = (struct ext4_fc_dentry_info *)val;
                        fprintf(out_file,
                                "tag %s, parent %d, ino %d, name \"%s\"\n",
-                               tag2str(tl->fc_tag),
+                               tag2str(tl.fc_tag),
                                le32_to_cpu(dentry_info->fc_parent_ino),
                                le32_to_cpu(dentry_info->fc_ino),
                                dentry_info->fc_dname);
                        break;
                case EXT4_FC_TAG_INODE:
                        fprintf(out_file, "tag %s, inode %d\n",
-                               tag2str(tl->fc_tag),
-                               le32_to_cpu(((struct ext4_fc_inode *)
-                                       ext4_fc_tag_val(tl))->fc_ino));
+                               tag2str(tl.fc_tag),
+                               le32_to_cpu(((struct ext4_fc_inode *)val)->fc_ino));
                        break;
                case EXT4_FC_TAG_PAD:
-                       fprintf(out_file, "tag %s\n", tag2str(tl->fc_tag));
+                       fprintf(out_file, "tag %s\n", tag2str(tl.fc_tag));
                        break;
                case EXT4_FC_TAG_TAIL:
-                       tail = (struct ext4_fc_tail *)ext4_fc_tag_val(tl);
+                       tail = (struct ext4_fc_tail *)val;
                        fprintf(out_file, "tag %s, tid %d\n",
-                               tag2str(tl->fc_tag),
+                               tag2str(tl.fc_tag),
                                le32_to_cpu(tail->fc_tid));
                        if (!dump_old &&
                                le32_to_cpu(tail->fc_tid) < transaction) {
@@ -617,9 +621,9 @@ static void dump_fc_block(FILE *out_file, char *buf, int blocksize,
                        break;
                case EXT4_FC_TAG_HEAD:
                        fprintf(out_file, "\n*** Fast Commit Area ***\n");
-                       head = (struct ext4_fc_head *)ext4_fc_tag_val(tl);
+                       head = (struct ext4_fc_head *)val;
                        fprintf(out_file, "tag %s, features 0x%x, tid %d\n",
-                               tag2str(tl->fc_tag),
+                               tag2str(tl.fc_tag),
                                le32_to_cpu(head->fc_features),
                                le32_to_cpu(head->fc_tid));
                        if (!dump_old &&