block: remove BLKDEV_IFL_WAIT

All the blkdev_issue_* helpers can only sanely be used for synchronous caller. To issue cache flushes or barriers asynchronously the caller needs to set up a bio by itself with a completion callback to move the asynchronous state machine ahead. So drop the BLKDEV_IFL_WAIT flag that is always specified when calling blkdev_issue_* and also remove the now unused flags argument to blkdev_issue_flush and blkdev_issue_zeroout. For blkdev_issue_discard we need to keep it for the secure discard flag, which gains a more descriptive name and loses the bitops vs flag confusion. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

block: remove BLKDEV_IFL_WAIT
All the blkdev_issue_* helpers can only sanely be used for synchronous caller. To issue cache flushes or barriers asynchronously the caller needs to set up a bio by itself with a completion callback to move the asynchronous state machine ahead. So drop the BLKDEV_IFL_WAIT flag that is always specified when calling blkdev_issue_* and also remove the now unused flags argument to blkdev_issue_flush and blkdev_issue_zeroout. For blkdev_issue_discard we need to keep it for the secure discard flag, which gains a more descriptive name and loses the bitops vs flag confusion. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Christoph Hellwig · Jens Axboe
1 parent 8786fb70cc
Showing 19 changed files with 47 additions and 71 deletions Side-by-side Diff
block/blk-flush.c
block/blk-lib.c
block/ioctl.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_receiver.c
fs/block_dev.c
fs/btrfs/extent-tree.c
fs/ext3/fsync.c
fs/ext4/fsync.c
fs/ext4/mballoc.c
fs/fat/fatent.c
fs/gfs2/rgrp.c
fs/jbd2/checkpoint.c
fs/jbd2/commit.c
fs/nilfs2/the_nilfs.c
fs/reiserfs/file.c
fs/xfs/linux-2.6/xfs_super.c
include/linux/blkdev.h
mm/swapfile.c
@@ -205,7 +205,6 @@
  * @bdev:	blockdev to issue flush for
  * @gfp_mask:	memory allocation flags (for bio_alloc)
  * @error_sector:	error sector
- * @flags:	BLKDEV_IFL_* flags to control behaviour
  *
  * Description:
  *    Issue a flush for the block device in question. Caller can supply
@@ -214,7 +213,7 @@
  *    request was pushed in some internal queue for later handling.
  */
 int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
-		sector_t *error_sector, unsigned long flags)
+		sector_t *error_sector)
 {
 	DECLARE_COMPLETION_ONSTACK(wait);
 	struct request_queue *q;
  
@@ -240,21 +239,19 @@
 	bio = bio_alloc(gfp_mask, 0);
 	bio->bi_end_io = bio_end_flush;
 	bio->bi_bdev = bdev;
-	if (test_bit(BLKDEV_WAIT, &flags))
-		bio->bi_private = &wait;
+	bio->bi_private = &wait;
  
 	bio_get(bio);
 	submit_bio(WRITE_FLUSH, bio);
-	if (test_bit(BLKDEV_WAIT, &flags)) {
-		wait_for_completion(&wait);
-		/*
-		 * The driver must store the error location in ->bi_sector, if
-		 * it supports it. For non-stacked drivers, this should be
-		 * copied from blk_rq_pos(rq).
-		 */
-		if (error_sector)
-			*error_sector = bio->bi_sector;
-	}
+	wait_for_completion(&wait);
+
+	/*
+	 * The driver must store the error location in ->bi_sector, if
+	 * it supports it. For non-stacked drivers, this should be
+	 * copied from blk_rq_pos(rq).
+	 */
+	if (error_sector)
+               *error_sector = bio->bi_sector;
  
 	if (!bio_flagged(bio, BIO_UPTODATE))
 		ret = -EIO;
@@ -61,7 +61,7 @@
 		max_discard_sectors &= ~(disc_sects - 1);
 	}
  
-	if (flags & BLKDEV_IFL_SECURE) {
+	if (flags & BLKDEV_DISCARD_SECURE) {
 		if (!blk_queue_secdiscard(q))
 			return -EOPNOTSUPP;
 		type |= REQ_SECURE;
@@ -77,8 +77,7 @@
 		bio->bi_sector = sector;
 		bio->bi_end_io = blkdev_discard_end_io;
 		bio->bi_bdev = bdev;
-		if (flags & BLKDEV_IFL_WAIT)
-			bio->bi_private = &wait;
+		bio->bi_private = &wait;
  
 		if (nr_sects > max_discard_sectors) {
 			bio->bi_size = max_discard_sectors << 9;
@@ -92,8 +91,7 @@
 		bio_get(bio);
 		submit_bio(type, bio);
  
-		if (flags & BLKDEV_IFL_WAIT)
-			wait_for_completion(&wait);
+		wait_for_completion(&wait);
  
 		if (bio_flagged(bio, BIO_EOPNOTSUPP))
 			ret = -EOPNOTSUPP;
@@ -139,7 +137,6 @@
  * @sector:	start sector
  * @nr_sects:	number of sectors to write
  * @gfp_mask:	memory allocation flags (for bio_alloc)
- * @flags:	BLKDEV_IFL_* flags to control behaviour
  *
  * Description:
  *  Generate and issue number of bios with zerofiled pages.
@@ -148,7 +145,7 @@
  */
  
 int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
-			sector_t nr_sects, gfp_t gfp_mask, unsigned long flags)
+			sector_t nr_sects, gfp_t gfp_mask)
 {
 	int ret;
 	struct bio *bio;
@@ -174,8 +171,7 @@
 		bio->bi_sector = sector;
 		bio->bi_bdev   = bdev;
 		bio->bi_end_io = bio_batch_end_io;
-		if (flags & BLKDEV_IFL_WAIT)
-			bio->bi_private = &bb;
+		bio->bi_private = &bb;
  
 		while (nr_sects != 0) {
 			sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
@@ -193,10 +189,9 @@
 		submit_bio(WRITE, bio);
 	}
  
-	if (flags & BLKDEV_IFL_WAIT)
-		/* Wait for bios in-flight */
-		while ( issued != atomic_read(&bb.done))
-			wait_for_completion(&wait);
+	/* Wait for bios in-flight */
+	while (issued != atomic_read(&bb.done))
+		wait_for_completion(&wait);
  
 	if (!test_bit(BIO_UPTODATE, &bb.flags))
 		/* One of bios in the batch was completed with error.*/
@@ -116,7 +116,7 @@
 static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
 			     uint64_t len, int secure)
 {
-	unsigned long flags = BLKDEV_IFL_WAIT;
+	unsigned long flags = 0;
  
 	if (start & 511)
 		return -EINVAL;
@@ -128,7 +128,7 @@
 	if (start + len > (bdev->bd_inode->i_size >> 9))
 		return -EINVAL;
 	if (secure)
-		flags |= BLKDEV_IFL_SECURE;
+		flags |= BLKDEV_DISCARD_SECURE;
 	return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags);
 }
  
@@ -2321,8 +2321,7 @@
 	if (test_bit(MD_NO_BARRIER, &mdev->flags))
 		return;
  
-	r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL,
-			BLKDEV_IFL_WAIT);
+	r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL);
 	if (r) {
 		set_bit(MD_NO_BARRIER, &mdev->flags);
 		dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
@@ -975,7 +975,7 @@
  
 	if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) {
 		rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL,
-					NULL, BLKDEV_IFL_WAIT);
+					NULL);
 		if (rv) {
 			dev_err(DEV, "local disk flush failed with status %d\n", rv);
 			/* would rather check on EOPNOTSUPP, but that is not reliable.
@@ -370,7 +370,7 @@
 	 */
 	mutex_unlock(&bd_inode->i_mutex);
  
-	error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL, BLKDEV_IFL_WAIT);
+	error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL);
 	if (error == -EOPNOTSUPP)
 		error = 0;
  
@@ -1695,8 +1695,7 @@
 static void btrfs_issue_discard(struct block_device *bdev,
 				u64 start, u64 len)
 {
-	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
-			BLKDEV_IFL_WAIT);
+	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, 0);
 }
  
 static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
@@ -90,8 +90,7 @@
 	 * storage
 	 */
 	if (needs_barrier)
-		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
-				BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 	return ret;
 }
@@ -128,11 +128,10 @@
 		    (journal->j_fs_dev != journal->j_dev) &&
 		    (journal->j_flags & JBD2_BARRIER))
 			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
-					NULL, BLKDEV_IFL_WAIT);
+					NULL);
 		ret = jbd2_log_wait_commit(journal, commit_tid);
 	} else if (journal->j_flags & JBD2_BARRIER)
-		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
-			BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 	return ret;
 }
@@ -2566,8 +2566,7 @@
 	discard_block = block + ext4_group_first_block_no(sb, block_group);
 	trace_ext4_discard_blocks(sb,
 			(unsigned long long) discard_block, count);
-	ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS,
-			       BLKDEV_IFL_WAIT);
+	ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
 	if (ret == EOPNOTSUPP) {
 		ext4_warning(sb, "discard not supported, disabling");
 		clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);
@@ -578,8 +578,7 @@
 				sb_issue_discard(sb,
 					fat_clus_to_blknr(sbi, first_cl),
 					nr_clus * sbi->sec_per_clus,
-					GFP_NOFS,
-					BLKDEV_IFL_WAIT);
+					GFP_NOFS, 0);
  
 				first_cl = cluster;
 			}
@@ -854,7 +854,7 @@
 				if ((start + nr_sects) != blk) {
 					rv = blkdev_issue_discard(bdev, start,
 							    nr_sects, GFP_NOFS,
-							    BLKDEV_IFL_WAIT);
+							    0);
 					if (rv)
 						goto fail;
 					nr_sects = 0;
@@ -868,8 +868,7 @@
 		}
 	}
 	if (nr_sects) {
-		rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS,
-					 BLKDEV_IFL_WAIT);
+		rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS, 0);
 		if (rv)
 			goto fail;
 	}
@@ -532,8 +532,7 @@
 	 */
 	if ((journal->j_fs_dev != journal->j_dev) &&
 	    (journal->j_flags & JBD2_BARRIER))
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL,
-			BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
 	if (!(journal->j_flags & JBD2_ABORT))
 		jbd2_journal_update_superblock(journal, 1);
 	return 0;
@@ -684,8 +684,7 @@
 	if (commit_transaction->t_flushed_data_blocks &&
 	    (journal->j_fs_dev != journal->j_dev) &&
 	    (journal->j_flags & JBD2_BARRIER))
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL,
-			BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
  
 	/* Done it all: now write the commit record asynchronously. */
 	if (JBD2_HAS_INCOMPAT_FEATURE(journal,
@@ -810,8 +809,7 @@
 	if (JBD2_HAS_INCOMPAT_FEATURE(journal,
 				      JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) &&
 	    journal->j_flags & JBD2_BARRIER) {
-		blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL,
-				   BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL);
 	}
  
 	if (err)
@@ -774,7 +774,7 @@
 			ret = blkdev_issue_discard(nilfs->ns_bdev,
 						   start * sects_per_block,
 						   nblocks * sects_per_block,
-						   GFP_NOFS, BLKDEV_IFL_WAIT);
+						   GFP_NOFS, 0);
 			if (ret < 0)
 				return ret;
 			nblocks = 0;
@@ -784,7 +784,7 @@
 		ret = blkdev_issue_discard(nilfs->ns_bdev,
 					   start * sects_per_block,
 					   nblocks * sects_per_block,
-					   GFP_NOFS, BLKDEV_IFL_WAIT);
+					   GFP_NOFS, 0);
 	return ret;
 }
  
@@ -152,8 +152,7 @@
 	barrier_done = reiserfs_commit_for_inode(inode);
 	reiserfs_write_unlock(inode->i_sb);
 	if (barrier_done != 1 && reiserfs_barrier_flush(inode->i_sb))
-		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL, 
-			BLKDEV_IFL_WAIT);
+		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 	if (barrier_done < 0)
 		return barrier_done;
 	return (err < 0) ? -EIO : 0;
@@ -693,8 +693,7 @@
 xfs_blkdev_issue_flush(
 	xfs_buftarg_t		*buftarg)
 {
-	blkdev_issue_flush(buftarg->bt_bdev, GFP_KERNEL, NULL,
-			BLKDEV_IFL_WAIT);
+	blkdev_issue_flush(buftarg->bt_bdev, GFP_KERNEL, NULL);
 }
  
 STATIC void
@@ -867,18 +867,14 @@
 		return NULL;
 	return bqt->tag_index[tag];
 }
-enum{
-	BLKDEV_WAIT,	/* wait for completion */
-	BLKDEV_SECURE,	/* secure discard */
-};
-#define BLKDEV_IFL_WAIT		(1 << BLKDEV_WAIT)
-#define BLKDEV_IFL_SECURE	(1 << BLKDEV_SECURE)
-extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *,
-			unsigned long);
+
+#define BLKDEV_DISCARD_SECURE  0x01    /* secure discard */
+
+extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *);
 extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
 extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
-			sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
+			sector_t nr_sects, gfp_t gfp_mask);
 static inline int sb_issue_discard(struct super_block *sb, sector_t block,
 		sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags)
 {
@@ -141,7 +141,7 @@
 	nr_blocks = ((sector_t)se->nr_pages - 1) << (PAGE_SHIFT - 9);
 	if (nr_blocks) {
 		err = blkdev_issue_discard(si->bdev, start_block,
-				nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT);
+				nr_blocks, GFP_KERNEL, 0);
 		if (err)
 			return err;
 		cond_resched();
@@ -152,7 +152,7 @@
 		nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9);
  
 		err = blkdev_issue_discard(si->bdev, start_block,
-				nr_blocks, GFP_KERNEL, BLKDEV_IFL_WAIT);
+				nr_blocks, GFP_KERNEL, 0);
 		if (err)
 			break;
  
@@ -191,7 +191,7 @@
 			start_block <<= PAGE_SHIFT - 9;
 			nr_blocks <<= PAGE_SHIFT - 9;
 			if (blkdev_issue_discard(si->bdev, start_block,
-				    nr_blocks, GFP_NOIO, BLKDEV_IFL_WAIT))
+				    nr_blocks, GFP_NOIO, 0))
 				break;
 		}
...	...	@@ -205,7 +205,6 @@
205	205	* @bdev: blockdev to issue flush for
206	206	* @gfp_mask: memory allocation flags (for bio_alloc)
207	207	* @error_sector: error sector
208		- * @flags: BLKDEV_IFL_* flags to control behaviour
209	208	*
210	209	* Description:
211	210	* Issue a flush for the block device in question. Caller can supply
...	...	@@ -214,7 +213,7 @@
214	213	* request was pushed in some internal queue for later handling.
215	214	*/
216	215	int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
217		- sector_t *error_sector, unsigned long flags)
	216	+ sector_t *error_sector)
218	217	{
219	218	DECLARE_COMPLETION_ONSTACK(wait);
220	219	struct request_queue *q;
221	220
...	...	@@ -240,21 +239,19 @@
240	239	bio = bio_alloc(gfp_mask, 0);
241	240	bio->bi_end_io = bio_end_flush;
242	241	bio->bi_bdev = bdev;
243		- if (test_bit(BLKDEV_WAIT, &flags))
244		- bio->bi_private = &wait;
	242	+ bio->bi_private = &wait;
245	243
246	244	bio_get(bio);
247	245	submit_bio(WRITE_FLUSH, bio);
248		- if (test_bit(BLKDEV_WAIT, &flags)) {
249		- wait_for_completion(&wait);
250		- /*
251		- * The driver must store the error location in ->bi_sector, if
252		- * it supports it. For non-stacked drivers, this should be
253		- * copied from blk_rq_pos(rq).
254		- */
255		- if (error_sector)
256		- *error_sector = bio->bi_sector;
257		- }
	246	+ wait_for_completion(&wait);
	247	+
	248	+ /*
	249	+ * The driver must store the error location in ->bi_sector, if
	250	+ * it supports it. For non-stacked drivers, this should be
	251	+ * copied from blk_rq_pos(rq).
	252	+ */
	253	+ if (error_sector)
	254	+ *error_sector = bio->bi_sector;
258	255
259	256	if (!bio_flagged(bio, BIO_UPTODATE))
260	257	ret = -EIO;
...	...	@@ -61,7 +61,7 @@
61	61	max_discard_sectors &= ~(disc_sects - 1);
62	62	}
63	63
64		- if (flags & BLKDEV_IFL_SECURE) {
	64	+ if (flags & BLKDEV_DISCARD_SECURE) {
65	65	if (!blk_queue_secdiscard(q))
66	66	return -EOPNOTSUPP;
67	67	type \|= REQ_SECURE;
...	...	@@ -77,8 +77,7 @@
77	77	bio->bi_sector = sector;
78	78	bio->bi_end_io = blkdev_discard_end_io;
79	79	bio->bi_bdev = bdev;
80		- if (flags & BLKDEV_IFL_WAIT)
81		- bio->bi_private = &wait;
	80	+ bio->bi_private = &wait;
82	81
83	82	if (nr_sects > max_discard_sectors) {
84	83	bio->bi_size = max_discard_sectors << 9;
...	...	@@ -92,8 +91,7 @@
92	91	bio_get(bio);
93	92	submit_bio(type, bio);
94	93
95		- if (flags & BLKDEV_IFL_WAIT)
96		- wait_for_completion(&wait);
	94	+ wait_for_completion(&wait);
97	95
98	96	if (bio_flagged(bio, BIO_EOPNOTSUPP))
99	97	ret = -EOPNOTSUPP;
...	...	@@ -139,7 +137,6 @@
139	137	* @sector: start sector
140	138	* @nr_sects: number of sectors to write
141	139	* @gfp_mask: memory allocation flags (for bio_alloc)
142		- * @flags: BLKDEV_IFL_* flags to control behaviour
143	140	*
144	141	* Description:
145	142	* Generate and issue number of bios with zerofiled pages.
...	...	@@ -148,7 +145,7 @@
148	145	*/
149	146
150	147	int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
151		- sector_t nr_sects, gfp_t gfp_mask, unsigned long flags)
	148	+ sector_t nr_sects, gfp_t gfp_mask)
152	149	{
153	150	int ret;
154	151	struct bio *bio;
...	...	@@ -174,8 +171,7 @@
174	171	bio->bi_sector = sector;
175	172	bio->bi_bdev = bdev;
176	173	bio->bi_end_io = bio_batch_end_io;
177		- if (flags & BLKDEV_IFL_WAIT)
178		- bio->bi_private = &bb;
	174	+ bio->bi_private = &bb;
179	175
180	176	while (nr_sects != 0) {
181	177	sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
...	...	@@ -193,10 +189,9 @@
193	189	submit_bio(WRITE, bio);
194	190	}
195	191
196		- if (flags & BLKDEV_IFL_WAIT)
197		- /* Wait for bios in-flight */
198		- while ( issued != atomic_read(&bb.done))
199		- wait_for_completion(&wait);
	192	+ /* Wait for bios in-flight */
	193	+ while (issued != atomic_read(&bb.done))
	194	+ wait_for_completion(&wait);
200	195
201	196	if (!test_bit(BIO_UPTODATE, &bb.flags))
202	197	/* One of bios in the batch was completed with error.*/
...	...	@@ -116,7 +116,7 @@
116	116	static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
117	117	uint64_t len, int secure)
118	118	{
119		- unsigned long flags = BLKDEV_IFL_WAIT;
	119	+ unsigned long flags = 0;
120	120
121	121	if (start & 511)
122	122	return -EINVAL;
...	...	@@ -128,7 +128,7 @@
128	128	if (start + len > (bdev->bd_inode->i_size >> 9))
129	129	return -EINVAL;
130	130	if (secure)
131		- flags \|= BLKDEV_IFL_SECURE;
	131	+ flags \|= BLKDEV_DISCARD_SECURE;
132	132	return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags);
133	133	}
134	134
...	...	@@ -2321,8 +2321,7 @@
2321	2321	if (test_bit(MD_NO_BARRIER, &mdev->flags))
2322	2322	return;
2323	2323
2324		- r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL,
2325		- BLKDEV_IFL_WAIT);
	2324	+ r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL);
2326	2325	if (r) {
2327	2326	set_bit(MD_NO_BARRIER, &mdev->flags);
2328	2327	dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
...	...	@@ -975,7 +975,7 @@
975	975
976	976	if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) {
977	977	rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL,
978		- NULL, BLKDEV_IFL_WAIT);
	978	+ NULL);
979	979	if (rv) {
980	980	dev_err(DEV, "local disk flush failed with status %d\n", rv);
981	981	/* would rather check on EOPNOTSUPP, but that is not reliable.
...	...	@@ -370,7 +370,7 @@
370	370	*/
371	371	mutex_unlock(&bd_inode->i_mutex);
372	372
373		- error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL, BLKDEV_IFL_WAIT);
	373	+ error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL);
374	374	if (error == -EOPNOTSUPP)
375	375	error = 0;
376	376
...	...	@@ -1695,8 +1695,7 @@
1695	1695	static void btrfs_issue_discard(struct block_device *bdev,
1696	1696	u64 start, u64 len)
1697	1697	{
1698		- blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
1699		- BLKDEV_IFL_WAIT);
	1698	+ blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, 0);
1700	1699	}
1701	1700
1702	1701	static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
...	...	@@ -90,8 +90,7 @@
90	90	* storage
91	91	*/
92	92	if (needs_barrier)
93		- blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
94		- BLKDEV_IFL_WAIT);
	93	+ blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
95	94	return ret;
96	95	}
...	...	@@ -128,11 +128,10 @@
128	128	(journal->j_fs_dev != journal->j_dev) &&
129	129	(journal->j_flags & JBD2_BARRIER))
130	130	blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
131		- NULL, BLKDEV_IFL_WAIT);
	131	+ NULL);
132	132	ret = jbd2_log_wait_commit(journal, commit_tid);
133	133	} else if (journal->j_flags & JBD2_BARRIER)
134		- blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
135		- BLKDEV_IFL_WAIT);
	134	+ blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
136	135	return ret;
137	136	}
...	...	@@ -2566,8 +2566,7 @@
2566	2566	discard_block = block + ext4_group_first_block_no(sb, block_group);
2567	2567	trace_ext4_discard_blocks(sb,
2568	2568	(unsigned long long) discard_block, count);
2569		- ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS,
2570		- BLKDEV_IFL_WAIT);
	2569	+ ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
2571	2570	if (ret == EOPNOTSUPP) {
2572	2571	ext4_warning(sb, "discard not supported, disabling");
2573	2572	clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);