From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 10 Aug 2021 14:29:21 +0000 (-0400)
Subject: e2fsck: drop gfp_t argument from blkdev_issue_flush()
X-Git-Tag: v1.46.4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5fff1797f10bf6e4c2581fb9815c175c0f0d937;p=thirdparty%2Fe2fsprogs.git

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 <tytso@mit.edu>
---

diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index 25744f088..4c4209262 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 96fe34a47..71483f66a 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(...)