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 25744f088a6c43f78a17f7dcfd37c10be1f83692..4c420926243799d5b6af0cb24340bc1f350ce9fd 100644 (file)
--- 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 96fe34a47ecd51ef735c1163078293a9378e2562..71483f66a187b73a1c5c9d62a289934901d38fd7 100644 (file)
--- 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(...)