From a5fff1797f10bf6e4c2581fb9815c175c0f0d937 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 10 Aug 2021 10:29:21 -0400 Subject: [PATCH] e2fsck: drop gfp_t argument from blkdev_issue_flush() This synchronizes e2fsprogs with kernel commit c6bf3f0e25f4 ("block: use an on-stack bio in blkdev_issue_flush"). Signed-off-by: Theodore Ts'o --- e2fsck/recovery.c | 2 +- lib/ext2fs/jfs_compat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index 25744f0..4c42092 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -325,7 +325,7 @@ int jbd2_journal_recover(journal_t *journal) err = err2; /* Make sure all replayed data is on permanent storage */ if (journal->j_flags & JBD2_BARRIER) { - err2 = blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL); + err2 = blkdev_issue_flush(journal->j_fs_dev); if (!err) err = err2; } diff --git a/lib/ext2fs/jfs_compat.h b/lib/ext2fs/jfs_compat.h index 96fe34a..71483f6 100644 --- a/lib/ext2fs/jfs_compat.h +++ b/lib/ext2fs/jfs_compat.h @@ -67,7 +67,7 @@ static inline __u32 jbd2_chksum(journal_t *j EXT2FS_ATTR((unused)), sizeof(struct __struct), __alignof__(struct __struct),\ (__flags), NULL) -#define blkdev_issue_flush(kdev, a) sync_blockdev(kdev) +#define blkdev_issue_flush(kdev) sync_blockdev(kdev) #define is_power_of_2(x) ((x) != 0 && (((x) & ((x) - 1)) == 0)) #define pr_emerg(fmt) #define pr_err(...) -- 1.8.3.1