Sync kernel's unification of jbd2 revoke and tag block checksum handling

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

diff --git a/debugfs/extent_inode.c b/debugfs/extent_inode.c
index b3c55f9..ada1308 100644 (file)
--- a/debugfs/extent_inode.c
+++ b/debugfs/extent_inode.c
@@ -64,7 +64,8 @@ static int common_extent_args_process(int argc, char *argv[], int min_argc,
 
 static char *orig_prompt, *extent_prompt;
 
-void do_extent_open(int argc, char *argv[])
+void do_extent_open(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
        int             ret;
@@ -97,6 +98,11 @@ void do_extent_open(int argc, char *argv[])
 
        orig_prompt = ss_get_prompt(sci_idx);
        extent_prompt = malloc(strlen(orig_prompt) + 32);
+       if (extent_prompt == NULL) {
+               com_err(argv[1], retval, "out of memory");
+               return;
+       }
+
        strcpy(extent_prompt, orig_prompt);
        cp = strchr(extent_prompt, ':');
        if (cp)
@@ -108,7 +114,8 @@ void do_extent_open(int argc, char *argv[])
        return;
 }
 
-void do_extent_close(int argc, char *argv[])
+void do_extent_close(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        int ret;
 
@@ -153,72 +160,86 @@ static void generic_goto_node(const char *my_name, int argc,
        dbg_print_extent(0, &extent);
 }
 
-void do_current_node(int argc, char *argv[])
+void do_current_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("current_node", argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_root_node(int argc, char *argv[])
+void do_root_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("root_node", argc, argv, EXT2_EXTENT_ROOT);
 }
 
-void do_last_leaf(int argc, char *argv[])
+void do_last_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("last_leaf", argc, argv, EXT2_EXTENT_LAST_LEAF);
 }
 
-void do_first_sib(int argc, char *argv[])
+void do_first_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("first_sib", argc, argv, EXT2_EXTENT_FIRST_SIB);
 }
 
-void do_last_sib(int argc, char *argv[])
+void do_last_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("next_sib", argc, argv, EXT2_EXTENT_LAST_SIB);
 }
 
-void do_next_sib(int argc, char *argv[])
+void do_next_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("next_sib", argc, argv, EXT2_EXTENT_NEXT_SIB);
 }
 
-void do_prev_sib(int argc, char *argv[])
+void do_prev_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("prev_sib", argc, argv, EXT2_EXTENT_PREV_SIB);
 }
 
-void do_next_leaf(int argc, char *argv[])
+void do_next_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("next_leaf", argc, argv, EXT2_EXTENT_NEXT_LEAF);
 }
 
-void do_prev_leaf(int argc, char *argv[])
+void do_prev_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("prev_leaf", argc, argv, EXT2_EXTENT_PREV_LEAF);
 }
 
-void do_next(int argc, char *argv[])
+void do_next(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("next", argc, argv, EXT2_EXTENT_NEXT);
 }
 
-void do_prev(int argc, char *argv[])
+void do_prev(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("prev", argc, argv, EXT2_EXTENT_PREV);
 }
 
-void do_up(int argc, char *argv[])
+void do_up(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+          void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("up", argc, argv, EXT2_EXTENT_UP);
 }
 
-void do_down(int argc, char *argv[])
+void do_down(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        generic_goto_node("down", argc, argv, EXT2_EXTENT_DOWN);
 }
 
-void do_delete_node(int argc, char *argv[])
+void do_delete_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2fs_extent extent;
        errcode_t       retval;
@@ -240,7 +261,8 @@ void do_delete_node(int argc, char *argv[])
        dbg_print_extent(0, &extent);
 }
 
-void do_replace_node(int argc, char *argv[])
+void do_replace_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--uninit] <lblk> <len> <pblk>";
        errcode_t       retval;
@@ -264,15 +286,15 @@ void do_replace_node(int argc, char *argv[])
                return;
        }
 
-       err = strtoblk(argv[0], argv[1], &extent.e_lblk);
+       err = strtoblk(argv[0], argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], argv[0], "logical block", &err);
+       extent.e_len = parse_ulong(argv[2], argv[0], "length", &err);
        if (err)
                return;
 
-       err = strtoblk(argv[0], argv[3], &extent.e_pblk);
+       err = strtoblk(argv[0], argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -284,7 +306,8 @@ void do_replace_node(int argc, char *argv[])
        generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_split_node(int argc, char *argv[])
+void do_split_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
 
@@ -300,7 +323,8 @@ void do_split_node(int argc, char *argv[])
        generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_insert_node(int argc, char *argv[])
+void do_insert_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--after] [--uninit] <lblk> <len> <pblk>";
        errcode_t       retval;
@@ -338,16 +362,15 @@ void do_insert_node(int argc, char *argv[])
                return;
        }
 
-       err = strtoblk(cmd, argv[1], &extent.e_lblk);
+       err = strtoblk(cmd, argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], cmd,
-                                   "length", &err);
+       extent.e_len = parse_ulong(argv[2], cmd, "length", &err);
        if (err)
                return;
 
-       err = strtoblk(cmd, argv[3], &extent.e_pblk);
+       err = strtoblk(cmd, argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -359,7 +382,8 @@ void do_insert_node(int argc, char *argv[])
        generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_set_bmap(int argc, char **argv)
+void do_set_bmap(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--uninit] <lblk> <pblk>";
        struct ext2fs_extent extent;
@@ -385,11 +409,11 @@ void do_set_bmap(int argc, char **argv)
                return;
        }
 
-       err = strtoblk(cmd, argv[1], &logical);
+       err = strtoblk(cmd, argv[1], "logical block", &logical);
        if (err)
                return;
 
-       err = strtoblk(cmd, argv[2], &physical);
+       err = strtoblk(cmd, argv[2], "physical block", &physical);
        if (err)
                return;
 
@@ -407,7 +431,8 @@ void do_set_bmap(int argc, char **argv)
        dbg_print_extent(0, &extent);
 }
 
-void do_print_all(int argc, char **argv)
+void do_print_all(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--leaf-only|--reverse|--reverse-leaf]";
        struct ext2fs_extent    extent;
@@ -458,7 +483,8 @@ void do_print_all(int argc, char **argv)
        }
 }
 
-void do_fix_parents(int argc, char **argv)
+void do_fix_parents(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t               retval;
 
@@ -473,7 +499,8 @@ void do_fix_parents(int argc, char **argv)
        }
 }
 
-void do_info(int argc, char **argv)
+void do_info(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2fs_extent    extent;
        struct ext2_extent_info info;
@@ -506,7 +533,8 @@ void do_info(int argc, char **argv)
               info.max_uninit_len);
 }
 
-void do_goto_block(int argc, char **argv)
+void do_goto_block(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t               retval;
        blk64_t                 blk;
@@ -516,7 +544,7 @@ void do_goto_block(int argc, char **argv)
                                       "block [level]", 0))
                return;
 
-       if (strtoblk(argv[0], argv[1], &blk))
+       if (strtoblk(argv[0], argv[1], NULL, &blk))
                return;
 
        if (argc == 3) {