From 6187d406bede6461086d6e5263f42ae4826675c4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2024 06:59:34 +0200 Subject: Merging upstream version 1.47.1. Signed-off-by: Daniel Baumann --- debugfs/do_journal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debugfs/do_journal.c') diff --git a/debugfs/do_journal.c b/debugfs/do_journal.c index 38439c6..116ca84 100644 --- a/debugfs/do_journal.c +++ b/debugfs/do_journal.c @@ -534,7 +534,7 @@ error: return err; } -void do_journal_write(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)), +void do_journal_write(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)), void *infop EXT2FS_ATTR((unused))) { blk64_t *blist = NULL, *rlist = NULL; @@ -862,7 +862,7 @@ static void update_64bit_flag(journal_t *journal) jbd2_set_feature_64bit(journal); } -void do_journal_open(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)), +void do_journal_open(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)), void *infop EXT2FS_ATTR((unused))) { int opt, enable_csum = 0, csum_ver = 3; @@ -933,7 +933,7 @@ void do_journal_open(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)), } void do_journal_close(int argc EXT2FS_ATTR((unused)), - char *argv[] EXT2FS_ATTR((unused)), + ss_argv_t argv EXT2FS_ATTR((unused)), int sci_idx EXT2FS_ATTR((unused)), void *infop EXT2FS_ATTR((unused))) { @@ -945,7 +945,7 @@ void do_journal_close(int argc EXT2FS_ATTR((unused)), ext2fs_close_journal(current_fs, ¤t_journal); } -void do_journal_run(int argc EXT2FS_ATTR((unused)), char *argv[], +void do_journal_run(int argc EXT2FS_ATTR((unused)), ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)), void *infop EXT2FS_ATTR((unused))) { -- cgit v1.2.3