p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block, drivers, fs: rename REQ_FLUSH to REQ_PREFLUSH 

To avoid confusion between REQ_OP_FLUSH, which is handled by
request_fn drivers, and upper layers requesting the block layer
perform a flush sequence along with possibly a WRITE, this patch
renames REQ_FLUSH to REQ_PREFLUSH.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Mike Christie 2016-06-05 14:32:25 -05:00 committed by Jens Axboe
parent a418090aa8
commit 28a8f0d317
39 changed files with 102 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/block/writeback_cache_control.txt
View File

@ -20,11 +20,11 @@ a forced cache flush, and the Force Unit Access (FUA) flag for requests.
Explicit cache flushes Explicit cache flushes
---------------------- ----------------------
The REQ_FLUSH flag can be OR ed into the r/w flags of a bio submitted from The REQ_PREFLUSH flag can be OR ed into the r/w flags of a bio submitted from
the filesystem and will make sure the volatile cache of the storage device the filesystem and will make sure the volatile cache of the storage device
has been flushed before the actual I/O operation is started. This explicitly has been flushed before the actual I/O operation is started. This explicitly
guarantees that previously completed write requests are on non-volatile guarantees that previously completed write requests are on non-volatile
storage before the flagged bio starts. In addition the REQ_FLUSH flag can be storage before the flagged bio starts. In addition the REQ_PREFLUSH flag can be
set on an otherwise empty bio structure, which causes only an explicit cache set on an otherwise empty bio structure, which causes only an explicit cache
flush without any dependent I/O. It is recommend to use flush without any dependent I/O. It is recommend to use
the blkdev_issue_flush() helper for a pure cache flush. the blkdev_issue_flush() helper for a pure cache flush.
@ -41,21 +41,21 @@ signaled after the data has been committed to non-volatile storage.
Implementation details for filesystems Implementation details for filesystems
-------------------------------------- --------------------------------------
Filesystems can simply set the REQ_FLUSH and REQ_FUA bits and do not have to Filesystems can simply set the REQ_PREFLUSH and REQ_FUA bits and do not have to
worry if the underlying devices need any explicit cache flushing and how worry if the underlying devices need any explicit cache flushing and how
the Forced Unit Access is implemented. The REQ_FLUSH and REQ_FUA flags the Forced Unit Access is implemented. The REQ_PREFLUSH and REQ_FUA flags
may both be set on a single bio. may both be set on a single bio.
Implementation details for make_request_fn based block drivers Implementation details for make_request_fn based block drivers
-------------------------------------------------------------- --------------------------------------------------------------
These drivers will always see the REQ_FLUSH and REQ_FUA bits as they sit These drivers will always see the REQ_PREFLUSH and REQ_FUA bits as they sit
directly below the submit_bio interface. For remapping drivers the REQ_FUA directly below the submit_bio interface. For remapping drivers the REQ_FUA
bits need to be propagated to underlying devices, and a global flush needs bits need to be propagated to underlying devices, and a global flush needs
to be implemented for bios with the REQ_FLUSH bit set. For real device to be implemented for bios with the REQ_PREFLUSH bit set. For real device
drivers that do not have a volatile cache the REQ_FLUSH and REQ_FUA bits drivers that do not have a volatile cache the REQ_PREFLUSH and REQ_FUA bits
on non-empty bios can simply be ignored, and REQ_FLUSH requests without on non-empty bios can simply be ignored, and REQ_PREFLUSH requests without
data can be completed successfully without doing any work. Drivers for data can be completed successfully without doing any work. Drivers for
devices with volatile caches need to implement the support for these devices with volatile caches need to implement the support for these
flags themselves without any help from the block layer. flags themselves without any help from the block layer.
@ -65,8 +65,8 @@ Implementation details for request_fn based block drivers
-------------------------------------------------------------- --------------------------------------------------------------
For devices that do not support volatile write caches there is no driver For devices that do not support volatile write caches there is no driver
support required, the block layer completes empty REQ_FLUSH requests before support required, the block layer completes empty REQ_PREFLUSH requests before
entering the driver and strips off the REQ_FLUSH and REQ_FUA bits from entering the driver and strips off the REQ_PREFLUSH and REQ_FUA bits from
requests that have a payload. For devices with volatile write caches the requests that have a payload. For devices with volatile write caches the
driver needs to tell the block layer that it supports flushing caches by driver needs to tell the block layer that it supports flushing caches by
doing: doing:
@ -74,7 +74,7 @@ doing:
blk_queue_write_cache(sdkp->disk->queue, true, false); blk_queue_write_cache(sdkp->disk->queue, true, false);
and handle empty REQ_OP_FLUSH requests in its prep_fn/request_fn. Note that and handle empty REQ_OP_FLUSH requests in its prep_fn/request_fn. Note that
REQ_FLUSH requests with a payload are automatically turned into a sequence REQ_PREFLUSH requests with a payload are automatically turned into a sequence
of an empty REQ_OP_FLUSH request followed by the actual write by the block of an empty REQ_OP_FLUSH request followed by the actual write by the block
layer. For devices that also support the FUA bit the block layer needs layer. For devices that also support the FUA bit the block layer needs
to be told to pass through the REQ_FUA bit using: to be told to pass through the REQ_FUA bit using:

10
Documentation/device-mapper/log-writes.txt
View File

@ -14,14 +14,14 @@ Log Ordering
We log things in order of completion once we are sure the write is no longer in We log things in order of completion once we are sure the write is no longer in
cache. This means that normal WRITE requests are not actually logged until the cache. This means that normal WRITE requests are not actually logged until the
next REQ_FLUSH request. This is to make it easier for userspace to replay the next REQ_PREFLUSH request. This is to make it easier for userspace to replay
log in a way that correlates to what is on disk and not what is in cache, to the log in a way that correlates to what is on disk and not what is in cache,
make it easier to detect improper waiting/flushing. to make it easier to detect improper waiting/flushing.
This works by attaching all WRITE requests to a list once the write completes. This works by attaching all WRITE requests to a list once the write completes.
Once we see a REQ_FLUSH request we splice this list onto the request and once Once we see a REQ_PREFLUSH request we splice this list onto the request and once
the FLUSH request completes we log all of the WRITEs and then the FLUSH. Only the FLUSH request completes we log all of the WRITEs and then the FLUSH. Only
completed WRITEs, at the time the REQ_FLUSH is issued, are added in order to completed WRITEs, at the time the REQ_PREFLUSH is issued, are added in order to
simulate the worst case scenario with regard to power failures. Consider the simulate the worst case scenario with regard to power failures. Consider the
following example (W means write, C means complete): following example (W means write, C means complete):

12
block/blk-core.c
View File

@ -1029,7 +1029,7 @@ static bool blk_rq_should_init_elevator(struct bio *bio)
* Flush requests do not use the elevator so skip initialization. * Flush requests do not use the elevator so skip initialization.
* This allows a request to share the flush and elevator data. * This allows a request to share the flush and elevator data.
*/ */
if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) if (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA))
return false; return false;
return true; return true;
@ -1736,7 +1736,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)
return BLK_QC_T_NONE; return BLK_QC_T_NONE;
} }
if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) { if (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA)) {
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
where = ELEVATOR_INSERT_FLUSH; where = ELEVATOR_INSERT_FLUSH;
goto get_rq; goto get_rq;
@ -1968,9 +1968,9 @@ generic_make_request_checks(struct bio *bio)
* drivers without flush support don't have to worry * drivers without flush support don't have to worry
* about them. * about them.
*/ */
if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && if ((bio->bi_rw & (REQ_PREFLUSH | REQ_FUA)) &&
!test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) {
bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA); bio->bi_rw &= ~(REQ_PREFLUSH | REQ_FUA);
if (!nr_sectors) { if (!nr_sectors) {
err = 0; err = 0;
goto end_io; goto end_io;
@ -2217,7 +2217,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
*/ */
BUG_ON(blk_queued_rq(rq)); BUG_ON(blk_queued_rq(rq));
if (rq->cmd_flags & (REQ_FLUSH|REQ_FUA)) if (rq->cmd_flags & (REQ_PREFLUSH | REQ_FUA))
where = ELEVATOR_INSERT_FLUSH; where = ELEVATOR_INSERT_FLUSH;
add_acct_request(q, rq, where); add_acct_request(q, rq, where);
@ -3311,7 +3311,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
/* /*
* rq is already accounted, so use raw insert * rq is already accounted, so use raw insert
*/ */
if (rq->cmd_flags & (REQ_FLUSH | REQ_FUA)) if (rq->cmd_flags & (REQ_PREFLUSH | REQ_FUA))
__elv_add_request(q, rq, ELEVATOR_INSERT_FLUSH); __elv_add_request(q, rq, ELEVATOR_INSERT_FLUSH);
else else
__elv_add_request(q, rq, ELEVATOR_INSERT_SORT_MERGE); __elv_add_request(q, rq, ELEVATOR_INSERT_SORT_MERGE);

16
block/blk-flush.c
View File

@ -10,8 +10,8 @@
* optional steps - PREFLUSH, DATA and POSTFLUSH - according to the request * optional steps - PREFLUSH, DATA and POSTFLUSH - according to the request
* properties and hardware capability. * properties and hardware capability.
* *
* If a request doesn't have data, only REQ_FLUSH makes sense, which * If a request doesn't have data, only REQ_PREFLUSH makes sense, which
* indicates a simple flush request. If there is data, REQ_FLUSH indicates * indicates a simple flush request. If there is data, REQ_PREFLUSH indicates
* that the device cache should be flushed before the data is executed, and * that the device cache should be flushed before the data is executed, and
* REQ_FUA means that the data must be on non-volatile media on request * REQ_FUA means that the data must be on non-volatile media on request
* completion. * completion.
@ -20,11 +20,11 @@
* difference. The requests are either completed immediately if there's no * difference. The requests are either completed immediately if there's no
* data or executed as normal requests otherwise. * data or executed as normal requests otherwise.
* *
* If the device has writeback cache and supports FUA, REQ_FLUSH is * If the device has writeback cache and supports FUA, REQ_PREFLUSH is
* translated to PREFLUSH but REQ_FUA is passed down directly with DATA. * translated to PREFLUSH but REQ_FUA is passed down directly with DATA.
* *
* If the device has writeback cache and doesn't support FUA, REQ_FLUSH is * If the device has writeback cache and doesn't support FUA, REQ_PREFLUSH
* translated to PREFLUSH and REQ_FUA to POSTFLUSH. * is translated to PREFLUSH and REQ_FUA to POSTFLUSH.
* *
* The actual execution of flush is double buffered. Whenever a request * The actual execution of flush is double buffered. Whenever a request
* needs to execute PRE or POSTFLUSH, it queues at * needs to execute PRE or POSTFLUSH, it queues at
@ -103,7 +103,7 @@ static unsigned int blk_flush_policy(unsigned long fflags, struct request *rq)
policy |= REQ_FSEQ_DATA; policy |= REQ_FSEQ_DATA;
if (fflags & (1UL << QUEUE_FLAG_WC)) { if (fflags & (1UL << QUEUE_FLAG_WC)) {
if (rq->cmd_flags & REQ_FLUSH) if (rq->cmd_flags & REQ_PREFLUSH)
policy |= REQ_FSEQ_PREFLUSH; policy |= REQ_FSEQ_PREFLUSH;
if (!(fflags & (1UL << QUEUE_FLAG_FUA)) && if (!(fflags & (1UL << QUEUE_FLAG_FUA)) &&
(rq->cmd_flags & REQ_FUA)) (rq->cmd_flags & REQ_FUA))
@ -391,9 +391,9 @@ void blk_insert_flush(struct request *rq)
/* /*
* @policy now records what operations need to be done. Adjust * @policy now records what operations need to be done. Adjust
* REQ_FLUSH and FUA for the driver. * REQ_PREFLUSH and FUA for the driver.
*/ */
rq->cmd_flags &= ~REQ_FLUSH; rq->cmd_flags &= ~REQ_PREFLUSH;
if (!(fflags & (1UL << QUEUE_FLAG_FUA))) if (!(fflags & (1UL << QUEUE_FLAG_FUA)))
rq->cmd_flags &= ~REQ_FUA; rq->cmd_flags &= ~REQ_FUA;

4
block/blk-mq.c
View File

@ -1247,7 +1247,7 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie)
static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
{ {
const int is_sync = rw_is_sync(bio_op(bio), bio->bi_rw); const int is_sync = rw_is_sync(bio_op(bio), bio->bi_rw);
const int is_flush_fua = bio->bi_rw & (REQ_FLUSH | REQ_FUA); const int is_flush_fua = bio->bi_rw & (REQ_PREFLUSH | REQ_FUA);
struct blk_map_ctx data; struct blk_map_ctx data;
struct request *rq; struct request *rq;
unsigned int request_count = 0; unsigned int request_count = 0;
@ -1344,7 +1344,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio) static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)
{ {
const int is_sync = rw_is_sync(bio_op(bio), bio->bi_rw); const int is_sync = rw_is_sync(bio_op(bio), bio->bi_rw);
const int is_flush_fua = bio->bi_rw & (REQ_FLUSH | REQ_FUA); const int is_flush_fua = bio->bi_rw & (REQ_PREFLUSH | REQ_FUA);
struct blk_plug *plug; struct blk_plug *plug;
unsigned int request_count = 0; unsigned int request_count = 0;
struct blk_map_ctx data; struct blk_map_ctx data;

4
drivers/block/drbd/drbd_actlog.c
View File

@ -148,7 +148,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device,
device->md_io.error = -ENODEV; device->md_io.error = -ENODEV;
if ((op == REQ_OP_WRITE) && !test_bit(MD_NO_FUA, &device->flags)) if ((op == REQ_OP_WRITE) && !test_bit(MD_NO_FUA, &device->flags))
op_flags |= REQ_FUA | REQ_FLUSH; op_flags |= REQ_FUA | REQ_PREFLUSH;
op_flags |= REQ_SYNC | REQ_NOIDLE; op_flags |= REQ_SYNC | REQ_NOIDLE;
bio = bio_alloc_drbd(GFP_NOIO); bio = bio_alloc_drbd(GFP_NOIO);
@ -847,7 +847,7 @@ int __drbd_change_sync(struct drbd_device *device, sector_t sector, int size,
unsigned long count = 0; unsigned long count = 0;
sector_t esector, nr_sectors; sector_t esector, nr_sectors;
/* This would be an empty REQ_FLUSH, be silent. */ /* This would be an empty REQ_PREFLUSH, be silent. */
if ((mode == SET_OUT_OF_SYNC) && size == 0) if ((mode == SET_OUT_OF_SYNC) && size == 0)
return 0; return 0;

2
drivers/block/drbd/drbd_main.c
View File

@ -1609,7 +1609,7 @@ static u32 bio_flags_to_wire(struct drbd_connection *connection,
if (connection->agreed_pro_version >= 95) if (connection->agreed_pro_version >= 95)
return (bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0) | return (bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0) |
(bio->bi_rw & REQ_FUA ? DP_FUA : 0) | (bio->bi_rw & REQ_FUA ? DP_FUA : 0) |
(bio->bi_rw & REQ_FLUSH ? DP_FLUSH : 0) | (bio->bi_rw & REQ_PREFLUSH ? DP_FLUSH : 0) |
(bio_op(bio) == REQ_OP_DISCARD ? DP_DISCARD : 0); (bio_op(bio) == REQ_OP_DISCARD ? DP_DISCARD : 0);
else else
return bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0; return bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0;

2
drivers/block/drbd/drbd_protocol.h
View File

@ -112,7 +112,7 @@ struct p_header100 {
#define DP_MAY_SET_IN_SYNC 4 #define DP_MAY_SET_IN_SYNC 4
#define DP_UNPLUG 8 /* not used anymore */ #define DP_UNPLUG 8 /* not used anymore */
#define DP_FUA 16 /* equals REQ_FUA */ #define DP_FUA 16 /* equals REQ_FUA */
#define DP_FLUSH 32 /* equals REQ_FLUSH */ #define DP_FLUSH 32 /* equals REQ_PREFLUSH */
#define DP_DISCARD 64 /* equals REQ_DISCARD */ #define DP_DISCARD 64 /* equals REQ_DISCARD */
#define DP_SEND_RECEIVE_ACK 128 /* This is a proto B write request */ #define DP_SEND_RECEIVE_ACK 128 /* This is a proto B write request */
#define DP_SEND_WRITE_ACK 256 /* This is a proto C write request */ #define DP_SEND_WRITE_ACK 256 /* This is a proto C write request */

2
drivers/block/drbd/drbd_receiver.c
View File

@ -2158,7 +2158,7 @@ static unsigned long wire_flags_to_bio_flags(u32 dpf)
{ {
return (dpf & DP_RW_SYNC ? REQ_SYNC : 0) | return (dpf & DP_RW_SYNC ? REQ_SYNC : 0) |
(dpf & DP_FUA ? REQ_FUA : 0) | (dpf & DP_FUA ? REQ_FUA : 0) |
(dpf & DP_FLUSH ? REQ_FLUSH : 0); (dpf & DP_FLUSH ? REQ_PREFLUSH : 0);
} }
static unsigned long wire_flags_to_bio_op(u32 dpf) static unsigned long wire_flags_to_bio_op(u32 dpf)

2
drivers/block/drbd/drbd_req.c
View File

@ -1132,7 +1132,7 @@ static int drbd_process_write_request(struct drbd_request *req)
* replicating, in which case there is no point. */ * replicating, in which case there is no point. */
if (unlikely(req->i.size == 0)) { if (unlikely(req->i.size == 0)) {
/* The only size==0 bios we expect are empty flushes. */ /* The only size==0 bios we expect are empty flushes. */
D_ASSERT(device, req->master_bio->bi_rw & REQ_FLUSH); D_ASSERT(device, req->master_bio->bi_rw & REQ_PREFLUSH);
if (remote) if (remote)
_req_mod(req, QUEUE_AS_DRBD_BARRIER); _req_mod(req, QUEUE_AS_DRBD_BARRIER);
return remote; return remote;

2
drivers/md/bcache/journal.c
View File

@ -631,7 +631,7 @@ static void journal_write_unlocked(struct closure *cl)
bio->bi_end_io = journal_write_endio; bio->bi_end_io = journal_write_endio;
bio->bi_private = w; bio->bi_private = w;
bio_set_op_attrs(bio, REQ_OP_WRITE, bio_set_op_attrs(bio, REQ_OP_WRITE,
REQ_SYNC|REQ_META|REQ_FLUSH|REQ_FUA); REQ_SYNC|REQ_META|REQ_PREFLUSH|REQ_FUA);
bch_bio_map(bio, w->data); bch_bio_map(bio, w->data);
trace_bcache_journal_write(bio); trace_bcache_journal_write(bio);

8
drivers/md/bcache/request.c
View File

@ -205,10 +205,10 @@ static void bch_data_insert_start(struct closure *cl)
return bch_data_invalidate(cl); return bch_data_invalidate(cl);
/* /*
* Journal writes are marked REQ_FLUSH; if the original write was a * Journal writes are marked REQ_PREFLUSH; if the original write was a
* flush, it'll wait on the journal write. * flush, it'll wait on the journal write.
*/ */
bio->bi_rw &= ~(REQ_FLUSH|REQ_FUA); bio->bi_rw &= ~(REQ_PREFLUSH|REQ_FUA);
do { do {
unsigned i; unsigned i;
@ -668,7 +668,7 @@ static inline struct search *search_alloc(struct bio *bio,
s->iop.write_prio = 0; s->iop.write_prio = 0;
s->iop.error = 0; s->iop.error = 0;
s->iop.flags = 0; s->iop.flags = 0;
s->iop.flush_journal = (bio->bi_rw & (REQ_FLUSH|REQ_FUA)) != 0; s->iop.flush_journal = (bio->bi_rw & (REQ_PREFLUSH|REQ_FUA)) != 0;
s->iop.wq = bcache_wq; s->iop.wq = bcache_wq;
return s; return s;
@ -920,7 +920,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
bch_writeback_add(dc); bch_writeback_add(dc);
s->iop.bio = bio; s->iop.bio = bio;
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
/* Also need to send a flush to the backing device */ /* Also need to send a flush to the backing device */
struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0, struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0,
dc->disk.bio_split); dc->disk.bio_split);

12
drivers/md/dm-cache-target.c
View File

@ -788,7 +788,7 @@ static void check_if_tick_bio_needed(struct cache *cache, struct bio *bio)
spin_lock_irqsave(&cache->lock, flags); spin_lock_irqsave(&cache->lock, flags);
if (cache->need_tick_bio && if (cache->need_tick_bio &&
!(bio->bi_rw & (REQ_FUA | REQ_FLUSH)) && !(bio->bi_rw & (REQ_FUA | REQ_PREFLUSH)) &&
bio_op(bio) != REQ_OP_DISCARD) { bio_op(bio) != REQ_OP_DISCARD) {
pb->tick = true; pb->tick = true;
cache->need_tick_bio = false; cache->need_tick_bio = false;
@ -830,7 +830,7 @@ static dm_oblock_t get_bio_block(struct cache *cache, struct bio *bio)
static int bio_triggers_commit(struct cache *cache, struct bio *bio) static int bio_triggers_commit(struct cache *cache, struct bio *bio)
{ {
return bio->bi_rw & (REQ_FLUSH | REQ_FUA); return bio->bi_rw & (REQ_PREFLUSH | REQ_FUA);
} }
/* /*
@ -1069,7 +1069,7 @@ static void dec_io_migrations(struct cache *cache)
static bool discard_or_flush(struct bio *bio) static bool discard_or_flush(struct bio *bio)
{ {
return bio_op(bio) == REQ_OP_DISCARD || return bio_op(bio) == REQ_OP_DISCARD ||
bio->bi_rw & (REQ_FLUSH | REQ_FUA); bio->bi_rw & (REQ_PREFLUSH | REQ_FUA);
} }
static void __cell_defer(struct cache *cache, struct dm_bio_prison_cell *cell) static void __cell_defer(struct cache *cache, struct dm_bio_prison_cell *cell)
@ -1614,8 +1614,8 @@ static void process_flush_bio(struct cache *cache, struct bio *bio)
remap_to_cache(cache, bio, 0); remap_to_cache(cache, bio, 0);
/* /*
* REQ_FLUSH is not directed at any particular block so we don't * REQ_PREFLUSH is not directed at any particular block so we don't
* need to inc_ds(). REQ_FUA's are split into a write + REQ_FLUSH * need to inc_ds(). REQ_FUA's are split into a write + REQ_PREFLUSH
* by dm-core. * by dm-core.
*/ */
issue(cache, bio); issue(cache, bio);
@ -1980,7 +1980,7 @@ static void process_deferred_bios(struct cache *cache)
bio = bio_list_pop(&bios); bio = bio_list_pop(&bios);
if (bio->bi_rw & REQ_FLUSH) if (bio->bi_rw & REQ_PREFLUSH)
process_flush_bio(cache, bio); process_flush_bio(cache, bio);
else if (bio_op(bio) == REQ_OP_DISCARD) else if (bio_op(bio) == REQ_OP_DISCARD)
process_discard_bio(cache, &structs, bio); process_discard_bio(cache, &structs, bio);

7
drivers/md/dm-crypt.c
View File

@ -1911,11 +1911,12 @@ static int crypt_map(struct dm_target *ti, struct bio *bio)
struct crypt_config *cc = ti->private; struct crypt_config *cc = ti->private;
/* /*
* If bio is REQ_FLUSH or REQ_OP_DISCARD, just bypass crypt queues. * If bio is REQ_PREFLUSH or REQ_OP_DISCARD, just bypass crypt queues.
* - for REQ_FLUSH device-mapper core ensures that no IO is in-flight * - for REQ_PREFLUSH device-mapper core ensures that no IO is in-flight
* - for REQ_OP_DISCARD caller must use flush if IO ordering matters * - for REQ_OP_DISCARD caller must use flush if IO ordering matters
*/ */
if (unlikely(bio->bi_rw & REQ_FLUSH || bio_op(bio) == REQ_OP_DISCARD)) { if (unlikely(bio->bi_rw & REQ_PREFLUSH ||
bio_op(bio) == REQ_OP_DISCARD)) {
bio->bi_bdev = cc->dev->bdev; bio->bi_bdev = cc->dev->bdev;
if (bio_sectors(bio)) if (bio_sectors(bio))
bio->bi_iter.bi_sector = cc->start + bio->bi_iter.bi_sector = cc->start +

4
drivers/md/dm-era-target.c
View File

@ -1540,9 +1540,9 @@ static int era_map(struct dm_target *ti, struct bio *bio)
remap_to_origin(era, bio); remap_to_origin(era, bio);
/* /*
* REQ_FLUSH bios carry no data, so we're not interested in them. * REQ_PREFLUSH bios carry no data, so we're not interested in them.
*/ */
if (!(bio->bi_rw & REQ_FLUSH) && if (!(bio->bi_rw & REQ_PREFLUSH) &&
(bio_data_dir(bio) == WRITE) && (bio_data_dir(bio) == WRITE) &&
!metadata_current_marked(era->md, block)) { !metadata_current_marked(era->md, block)) {
defer_bio(era, bio); defer_bio(era, bio);

2
drivers/md/dm-io.c
View File

@ -380,7 +380,7 @@ static void dispatch_io(int op, int op_flags, unsigned int num_regions,
*/ */
for (i = 0; i < num_regions; i++) { for (i = 0; i < num_regions; i++) {
*dp = old_pages; *dp = old_pages;
if (where[i].count || (op_flags & REQ_FLUSH)) if (where[i].count || (op_flags & REQ_PREFLUSH))
do_region(op, op_flags, i, where + i, dp, io); do_region(op, op_flags, i, where + i, dp, io);
} }

2
drivers/md/dm-log-writes.c
View File

@ -555,7 +555,7 @@ static int log_writes_map(struct dm_target *ti, struct bio *bio)
struct bio_vec bv; struct bio_vec bv;
size_t alloc_size; size_t alloc_size;
int i = 0; int i = 0;
bool flush_bio = (bio->bi_rw & REQ_FLUSH); bool flush_bio = (bio->bi_rw & REQ_PREFLUSH);
bool fua_bio = (bio->bi_rw & REQ_FUA); bool fua_bio = (bio->bi_rw & REQ_FUA);
bool discard_bio = (bio_op(bio) == REQ_OP_DISCARD); bool discard_bio = (bio_op(bio) == REQ_OP_DISCARD);

5
drivers/md/dm-raid1.c
View File

@ -704,7 +704,7 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
bio_list_init(&requeue); bio_list_init(&requeue);
while ((bio = bio_list_pop(writes))) { while ((bio = bio_list_pop(writes))) {
if ((bio->bi_rw & REQ_FLUSH) || if ((bio->bi_rw & REQ_PREFLUSH) ||
(bio_op(bio) == REQ_OP_DISCARD)) { (bio_op(bio) == REQ_OP_DISCARD)) {
bio_list_add(&sync, bio); bio_list_add(&sync, bio);
continue; continue;
@ -1253,7 +1253,8 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error)
* We need to dec pending if this was a write. * We need to dec pending if this was a write.
*/ */
if (rw == WRITE) { if (rw == WRITE) {
if (!(bio->bi_rw & REQ_FLUSH) && bio_op(bio) != REQ_OP_DISCARD) if (!(bio->bi_rw & REQ_PREFLUSH) &&
bio_op(bio) != REQ_OP_DISCARD)
dm_rh_dec(ms->rh, bio_record->write_region); dm_rh_dec(ms->rh, bio_record->write_region);
return error; return error;
} }

4
drivers/md/dm-region-hash.c
View File

@ -398,7 +398,7 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio)
region_t region = dm_rh_bio_to_region(rh, bio); region_t region = dm_rh_bio_to_region(rh, bio);
int recovering = 0; int recovering = 0;
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
rh->flush_failure = 1; rh->flush_failure = 1;
return; return;
} }
@ -526,7 +526,7 @@ void dm_rh_inc_pending(struct dm_region_hash *rh, struct bio_list *bios)
struct bio *bio; struct bio *bio;
for (bio = bios->head; bio; bio = bio->bi_next) { for (bio = bios->head; bio; bio = bio->bi_next) {
if (bio->bi_rw & REQ_FLUSH || bio_op(bio) == REQ_OP_DISCARD) if (bio->bi_rw & REQ_PREFLUSH || bio_op(bio) == REQ_OP_DISCARD)
continue; continue;
rh_inc(rh, dm_rh_bio_to_region(rh, bio)); rh_inc(rh, dm_rh_bio_to_region(rh, bio));
} }

6
drivers/md/dm-snap.c
View File

@ -1680,7 +1680,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
init_tracked_chunk(bio); init_tracked_chunk(bio);
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
bio->bi_bdev = s->cow->bdev; bio->bi_bdev = s->cow->bdev;
return DM_MAPIO_REMAPPED; return DM_MAPIO_REMAPPED;
} }
@ -1799,7 +1799,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio)
init_tracked_chunk(bio); init_tracked_chunk(bio);
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
if (!dm_bio_get_target_bio_nr(bio)) if (!dm_bio_get_target_bio_nr(bio))
bio->bi_bdev = s->origin->bdev; bio->bi_bdev = s->origin->bdev;
else else
@ -2285,7 +2285,7 @@ static int origin_map(struct dm_target *ti, struct bio *bio)
bio->bi_bdev = o->dev->bdev; bio->bi_bdev = o->dev->bdev;
if (unlikely(bio->bi_rw & REQ_FLUSH)) if (unlikely(bio->bi_rw & REQ_PREFLUSH))
return DM_MAPIO_REMAPPED; return DM_MAPIO_REMAPPED;
if (bio_rw(bio) != WRITE) if (bio_rw(bio) != WRITE)

2
drivers/md/dm-stripe.c
View File

@ -286,7 +286,7 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
uint32_t stripe; uint32_t stripe;
unsigned target_bio_nr; unsigned target_bio_nr;
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
target_bio_nr = dm_bio_get_target_bio_nr(bio); target_bio_nr = dm_bio_get_target_bio_nr(bio);
BUG_ON(target_bio_nr >= sc->stripes); BUG_ON(target_bio_nr >= sc->stripes);
bio->bi_bdev = sc->stripe[target_bio_nr].dev->bdev; bio->bi_bdev = sc->stripe[target_bio_nr].dev->bdev;

8
drivers/md/dm-thin.c
View File

@ -697,7 +697,7 @@ static void remap_to_origin(struct thin_c *tc, struct bio *bio)
static int bio_triggers_commit(struct thin_c *tc, struct bio *bio) static int bio_triggers_commit(struct thin_c *tc, struct bio *bio)
{ {
return (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && return (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA)) &&
dm_thin_changed_this_transaction(tc->td); dm_thin_changed_this_transaction(tc->td);
} }
@ -868,7 +868,7 @@ static void __inc_remap_and_issue_cell(void *context,
struct bio *bio; struct bio *bio;
while ((bio = bio_list_pop(&cell->bios))) { while ((bio = bio_list_pop(&cell->bios))) {
if (bio->bi_rw & (REQ_FLUSH | REQ_FUA) || if (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA) ||
bio_op(bio) == REQ_OP_DISCARD) bio_op(bio) == REQ_OP_DISCARD)
bio_list_add(&info->defer_bios, bio); bio_list_add(&info->defer_bios, bio);
else { else {
@ -1641,7 +1641,7 @@ static void __remap_and_issue_shared_cell(void *context,
while ((bio = bio_list_pop(&cell->bios))) { while ((bio = bio_list_pop(&cell->bios))) {
if ((bio_data_dir(bio) == WRITE) || if ((bio_data_dir(bio) == WRITE) ||
(bio->bi_rw & (REQ_FLUSH | REQ_FUA) || (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA) ||
bio_op(bio) == REQ_OP_DISCARD)) bio_op(bio) == REQ_OP_DISCARD))
bio_list_add(&info->defer_bios, bio); bio_list_add(&info->defer_bios, bio);
else { else {
@ -2556,7 +2556,7 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)
return DM_MAPIO_SUBMITTED; return DM_MAPIO_SUBMITTED;
} }
if (bio->bi_rw & (REQ_FLUSH | REQ_FUA) || if (bio->bi_rw & (REQ_PREFLUSH | REQ_FUA) ||
bio_op(bio) == REQ_OP_DISCARD) { bio_op(bio) == REQ_OP_DISCARD) {
thin_defer_bio_with_throttle(tc, bio); thin_defer_bio_with_throttle(tc, bio);
return DM_MAPIO_SUBMITTED; return DM_MAPIO_SUBMITTED;

12
drivers/md/dm.c
View File

@ -1003,12 +1003,12 @@ static void dec_pending(struct dm_io *io, int error)
if (io_error == DM_ENDIO_REQUEUE) if (io_error == DM_ENDIO_REQUEUE)
return; return;
if ((bio->bi_rw & REQ_FLUSH) && bio->bi_iter.bi_size) { if ((bio->bi_rw & REQ_PREFLUSH) && bio->bi_iter.bi_size) {
/* /*
* Preflush done for flush with data, reissue * Preflush done for flush with data, reissue
* without REQ_FLUSH. * without REQ_PREFLUSH.
*/ */
bio->bi_rw &= ~REQ_FLUSH; bio->bi_rw &= ~REQ_PREFLUSH;
queue_io(md, bio); queue_io(md, bio);
} else { } else {
/* done with normal IO or empty flush */ /* done with normal IO or empty flush */
@ -1477,7 +1477,7 @@ EXPORT_SYMBOL_GPL(dm_set_target_max_io_len);
/* /*
* A target may call dm_accept_partial_bio only from the map routine. It is * A target may call dm_accept_partial_bio only from the map routine. It is
* allowed for all bio types except REQ_FLUSH. * allowed for all bio types except REQ_PREFLUSH.
* *
* dm_accept_partial_bio informs the dm that the target only wants to process * dm_accept_partial_bio informs the dm that the target only wants to process
* additional n_sectors sectors of the bio and the rest of the data should be * additional n_sectors sectors of the bio and the rest of the data should be
@ -1507,7 +1507,7 @@ void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors)
{ {
struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);
unsigned bi_size = bio->bi_iter.bi_size >> SECTOR_SHIFT; unsigned bi_size = bio->bi_iter.bi_size >> SECTOR_SHIFT;
BUG_ON(bio->bi_rw & REQ_FLUSH); BUG_ON(bio->bi_rw & REQ_PREFLUSH);
BUG_ON(bi_size > *tio->len_ptr); BUG_ON(bi_size > *tio->len_ptr);
BUG_ON(n_sectors > bi_size); BUG_ON(n_sectors > bi_size);
*tio->len_ptr -= bi_size - n_sectors; *tio->len_ptr -= bi_size - n_sectors;
@ -1795,7 +1795,7 @@ static void __split_and_process_bio(struct mapped_device *md,
start_io_acct(ci.io); start_io_acct(ci.io);
if (bio->bi_rw & REQ_FLUSH) { if (bio->bi_rw & REQ_PREFLUSH) {
ci.bio = &ci.md->flush_bio; ci.bio = &ci.md->flush_bio;
ci.sector_count = 0; ci.sector_count = 0;
error = __send_empty_flush(&ci); error = __send_empty_flush(&ci);

2
drivers/md/linear.c
View File

@ -221,7 +221,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)
struct bio *split; struct bio *split;
sector_t start_sector, end_sector, data_offset; sector_t start_sector, end_sector, data_offset;
if (unlikely(bio->bi_rw & REQ_FLUSH)) { if (unlikely(bio->bi_rw & REQ_PREFLUSH)) {
md_flush_request(mddev, bio); md_flush_request(mddev, bio);
return; return;
} }

2
drivers/md/md.c
View File

@ -414,7 +414,7 @@ static void md_submit_flush_data(struct work_struct *ws)
/* an empty barrier - all done */ /* an empty barrier - all done */
bio_endio(bio); bio_endio(bio);
else { else {
bio->bi_rw &= ~REQ_FLUSH; bio->bi_rw &= ~REQ_PREFLUSH;
mddev->pers->make_request(mddev, bio); mddev->pers->make_request(mddev, bio);
} }

2
drivers/md/md.h
View File

@ -424,7 +424,7 @@ struct mddev {
/* Generic flush handling. /* Generic flush handling.
* The last to finish preflush schedules a worker to submit * The last to finish preflush schedules a worker to submit
* the rest of the request (without the REQ_FLUSH flag). * the rest of the request (without the REQ_PREFLUSH flag).
*/ */
struct bio *flush_bio; struct bio *flush_bio;
atomic_t flush_pending; atomic_t flush_pending;

2
drivers/md/multipath.c
View File

@ -111,7 +111,7 @@ static void multipath_make_request(struct mddev *mddev, struct bio * bio)
struct multipath_bh * mp_bh; struct multipath_bh * mp_bh;
struct multipath_info *multipath; struct multipath_info *multipath;
if (unlikely(bio->bi_rw & REQ_FLUSH)) { if (unlikely(bio->bi_rw & REQ_PREFLUSH)) {
md_flush_request(mddev, bio); md_flush_request(mddev, bio);
return; return;
} }

2
drivers/md/raid0.c
View File

@ -458,7 +458,7 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
struct md_rdev *tmp_dev; struct md_rdev *tmp_dev;
struct bio *split; struct bio *split;
if (unlikely(bio->bi_rw & REQ_FLUSH)) { if (unlikely(bio->bi_rw & REQ_PREFLUSH)) {
md_flush_request(mddev, bio); md_flush_request(mddev, bio);
return; return;
} }

3
drivers/md/raid1.c
View File

@ -1056,7 +1056,8 @@ static void raid1_make_request(struct mddev *mddev, struct bio * bio)
const int op = bio_op(bio); const int op = bio_op(bio);
const int rw = bio_data_dir(bio); const int rw = bio_data_dir(bio);
const unsigned long do_sync = (bio->bi_rw & REQ_SYNC); const unsigned long do_sync = (bio->bi_rw & REQ_SYNC);
const unsigned long do_flush_fua = (bio->bi_rw & (REQ_FLUSH | REQ_FUA)); const unsigned long do_flush_fua = (bio->bi_rw &
(REQ_PREFLUSH | REQ_FUA));
const unsigned long do_sec = (bio->bi_rw & REQ_SECURE); const unsigned long do_sec = (bio->bi_rw & REQ_SECURE);
struct md_rdev *blocked_rdev; struct md_rdev *blocked_rdev;
struct blk_plug_cb *cb; struct blk_plug_cb *cb;

2
drivers/md/raid10.c
View File

@ -1447,7 +1447,7 @@ static void raid10_make_request(struct mddev *mddev, struct bio *bio)
struct bio *split; struct bio *split;
if (unlikely(bio->bi_rw & REQ_FLUSH)) { if (unlikely(bio->bi_rw & REQ_PREFLUSH)) {
md_flush_request(mddev, bio); md_flush_request(mddev, bio);
return; return;
} }

2
drivers/md/raid5-cache.c
View File

@ -536,7 +536,7 @@ int r5l_handle_flush_request(struct r5l_log *log, struct bio *bio)
bio_endio(bio); bio_endio(bio);
return 0; return 0;
} }
bio->bi_rw &= ~REQ_FLUSH; bio->bi_rw &= ~REQ_PREFLUSH;
return -EAGAIN; return -EAGAIN;
} }

2
drivers/md/raid5.c
View File

@ -5150,7 +5150,7 @@ static void raid5_make_request(struct mddev *mddev, struct bio * bi)
DEFINE_WAIT(w); DEFINE_WAIT(w);
bool do_prepare; bool do_prepare;
if (unlikely(bi->bi_rw & REQ_FLUSH)) { if (unlikely(bi->bi_rw & REQ_PREFLUSH)) {
int ret = r5l_handle_flush_request(conf->log, bi); int ret = r5l_handle_flush_request(conf->log, bi);
if (ret == 0) if (ret == 0)

8
fs/btrfs/check-integrity.c
View File

@ -2207,7 +2207,7 @@ static void btrfsic_bio_end_io(struct bio *bp)
block->dev_bytenr, block->mirror_num); block->dev_bytenr, block->mirror_num);
next_block = block->next_in_same_bio; next_block = block->next_in_same_bio;
block->iodone_w_error = iodone_w_error; block->iodone_w_error = iodone_w_error;
if (block->submit_bio_bh_rw & REQ_FLUSH) { if (block->submit_bio_bh_rw & REQ_PREFLUSH) {
dev_state->last_flush_gen++; dev_state->last_flush_gen++;
if ((dev_state->state->print_mask & if ((dev_state->state->print_mask &
BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) BTRFSIC_PRINT_MASK_END_IO_BIO_BH))
@ -2243,7 +2243,7 @@ static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate)
block->dev_bytenr, block->mirror_num); block->dev_bytenr, block->mirror_num);
block->iodone_w_error = iodone_w_error; block->iodone_w_error = iodone_w_error;
if (block->submit_bio_bh_rw & REQ_FLUSH) { if (block->submit_bio_bh_rw & REQ_PREFLUSH) {
dev_state->last_flush_gen++; dev_state->last_flush_gen++;
if ((dev_state->state->print_mask & if ((dev_state->state->print_mask &
BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) BTRFSIC_PRINT_MASK_END_IO_BIO_BH))
@ -2884,7 +2884,7 @@ int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)
btrfsic_process_written_block(dev_state, dev_bytenr, btrfsic_process_written_block(dev_state, dev_bytenr,
&bh->b_data, 1, NULL, &bh->b_data, 1, NULL,
NULL, bh, op_flags); NULL, bh, op_flags);
} else if (NULL != dev_state && (op_flags & REQ_FLUSH)) { } else if (NULL != dev_state && (op_flags & REQ_PREFLUSH)) {
if (dev_state->state->print_mask & if (dev_state->state->print_mask &
BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
printk(KERN_INFO printk(KERN_INFO
@ -2982,7 +2982,7 @@ static void __btrfsic_submit_bio(struct bio *bio)
kunmap(bio->bi_io_vec[i].bv_page); kunmap(bio->bi_io_vec[i].bv_page);
} }
kfree(mapped_datav); kfree(mapped_datav);
} else if (NULL != dev_state && (bio->bi_rw & REQ_FLUSH)) { } else if (NULL != dev_state && (bio->bi_rw & REQ_PREFLUSH)) {
if (dev_state->state->print_mask & if (dev_state->state->print_mask &
BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
printk(KERN_INFO printk(KERN_INFO

2
fs/jbd2/journal.c
View File

@ -1354,7 +1354,7 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags)
trace_jbd2_write_superblock(journal, write_flags); trace_jbd2_write_superblock(journal, write_flags);
if (!(journal->j_flags & JBD2_BARRIER)) if (!(journal->j_flags & JBD2_BARRIER))
write_flags &= ~(REQ_FUA | REQ_FLUSH); write_flags &= ~(REQ_FUA | REQ_PREFLUSH);
lock_buffer(bh); lock_buffer(bh);
if (buffer_write_io_error(bh)) { if (buffer_write_io_error(bh)) {
/* /*

2
fs/xfs/xfs_buf.c
View File

@ -1237,7 +1237,7 @@ _xfs_buf_ioapply(
if (bp->b_flags & XBF_FUA) if (bp->b_flags & XBF_FUA)
op_flags |= REQ_FUA; op_flags |= REQ_FUA;
if (bp->b_flags & XBF_FLUSH) if (bp->b_flags & XBF_FLUSH)
op_flags |= REQ_FLUSH; op_flags |= REQ_PREFLUSH;
/* /*
* Run the write verifier callback function if it exists. If * Run the write verifier callback function if it exists. If

8
include/linux/blk_types.h
View File

@ -168,7 +168,7 @@ enum rq_flag_bits {
__REQ_NOIDLE, /* don't anticipate more IO after this one */ __REQ_NOIDLE, /* don't anticipate more IO after this one */
__REQ_INTEGRITY, /* I/O includes block integrity payload */ __REQ_INTEGRITY, /* I/O includes block integrity payload */
__REQ_FUA, /* forced unit access */ __REQ_FUA, /* forced unit access */
__REQ_FLUSH, /* request for cache flush */ __REQ_PREFLUSH, /* request for cache flush */
/* bio only flags */ /* bio only flags */
__REQ_RAHEAD, /* read ahead, can fail anytime */ __REQ_RAHEAD, /* read ahead, can fail anytime */
@ -212,12 +212,12 @@ enum rq_flag_bits {
(REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER) (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)
#define REQ_COMMON_MASK \ #define REQ_COMMON_MASK \
(REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | REQ_NOIDLE | \ (REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | REQ_NOIDLE | \
REQ_FLUSH | REQ_FUA | REQ_SECURE | REQ_INTEGRITY | REQ_NOMERGE) REQ_PREFLUSH | REQ_FUA | REQ_SECURE | REQ_INTEGRITY | REQ_NOMERGE)
#define REQ_CLONE_MASK REQ_COMMON_MASK #define REQ_CLONE_MASK REQ_COMMON_MASK
/* This mask is used for both bio and request merge checking */ /* This mask is used for both bio and request merge checking */
#define REQ_NOMERGE_FLAGS \ #define REQ_NOMERGE_FLAGS \
(REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_FLUSH_SEQ) (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_PREFLUSH | REQ_FUA | REQ_FLUSH_SEQ)
#define REQ_RAHEAD (1ULL << __REQ_RAHEAD) #define REQ_RAHEAD (1ULL << __REQ_RAHEAD)
#define REQ_THROTTLED (1ULL << __REQ_THROTTLED) #define REQ_THROTTLED (1ULL << __REQ_THROTTLED)
@ -235,7 +235,7 @@ enum rq_flag_bits {
#define REQ_PREEMPT (1ULL << __REQ_PREEMPT) #define REQ_PREEMPT (1ULL << __REQ_PREEMPT)
#define REQ_ALLOCED (1ULL << __REQ_ALLOCED) #define REQ_ALLOCED (1ULL << __REQ_ALLOCED)
#define REQ_COPY_USER (1ULL << __REQ_COPY_USER) #define REQ_COPY_USER (1ULL << __REQ_COPY_USER)
#define REQ_FLUSH (1ULL << __REQ_FLUSH) #define REQ_PREFLUSH (1ULL << __REQ_PREFLUSH)
#define REQ_FLUSH_SEQ (1ULL << __REQ_FLUSH_SEQ) #define REQ_FLUSH_SEQ (1ULL << __REQ_FLUSH_SEQ)
#define REQ_IO_STAT (1ULL << __REQ_IO_STAT) #define REQ_IO_STAT (1ULL << __REQ_IO_STAT)
#define REQ_MIXED_MERGE (1ULL << __REQ_MIXED_MERGE) #define REQ_MIXED_MERGE (1ULL << __REQ_MIXED_MERGE)

4
include/linux/fs.h
View File

@ -204,9 +204,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
#define READ_SYNC REQ_SYNC #define READ_SYNC REQ_SYNC
#define WRITE_SYNC (REQ_SYNC | REQ_NOIDLE) #define WRITE_SYNC (REQ_SYNC | REQ_NOIDLE)
#define WRITE_ODIRECT REQ_SYNC #define WRITE_ODIRECT REQ_SYNC
#define WRITE_FLUSH (REQ_SYNC | REQ_NOIDLE | REQ_FLUSH) #define WRITE_FLUSH (REQ_SYNC | REQ_NOIDLE | REQ_PREFLUSH)
#define WRITE_FUA (REQ_SYNC | REQ_NOIDLE | REQ_FUA) #define WRITE_FUA (REQ_SYNC | REQ_NOIDLE | REQ_FUA)
#define WRITE_FLUSH_FUA (REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA) #define WRITE_FLUSH_FUA (REQ_SYNC | REQ_NOIDLE | REQ_PREFLUSH | REQ_FUA)
/* /*
* Attribute flags. These should be or-ed together to figure out what * Attribute flags. These should be or-ed together to figure out what

2
include/trace/events/f2fs.h
View File

@ -33,7 +33,7 @@ TRACE_DEFINE_ENUM(SSR);
TRACE_DEFINE_ENUM(__REQ_RAHEAD); TRACE_DEFINE_ENUM(__REQ_RAHEAD);
TRACE_DEFINE_ENUM(__REQ_SYNC); TRACE_DEFINE_ENUM(__REQ_SYNC);
TRACE_DEFINE_ENUM(__REQ_NOIDLE); TRACE_DEFINE_ENUM(__REQ_NOIDLE);
TRACE_DEFINE_ENUM(__REQ_FLUSH); TRACE_DEFINE_ENUM(__REQ_PREFLUSH);
TRACE_DEFINE_ENUM(__REQ_FUA); TRACE_DEFINE_ENUM(__REQ_FUA);
TRACE_DEFINE_ENUM(__REQ_PRIO); TRACE_DEFINE_ENUM(__REQ_PRIO);
TRACE_DEFINE_ENUM(__REQ_META); TRACE_DEFINE_ENUM(__REQ_META);

5
kernel/trace/blktrace.c
View File

@ -189,6 +189,7 @@ static const u32 ddir_act[2] = { BLK_TC_ACT(BLK_TC_READ),
BLK_TC_ACT(BLK_TC_WRITE) }; BLK_TC_ACT(BLK_TC_WRITE) };
#define BLK_TC_RAHEAD BLK_TC_AHEAD #define BLK_TC_RAHEAD BLK_TC_AHEAD
#define BLK_TC_PREFLUSH BLK_TC_FLUSH
/* The ilog2() calls fall out because they're constant */ /* The ilog2() calls fall out because they're constant */
#define MASK_TC_BIT(rw, __name) ((rw & REQ_ ## __name) << \ #define MASK_TC_BIT(rw, __name) ((rw & REQ_ ## __name) << \
@ -219,7 +220,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
what |= MASK_TC_BIT(op_flags, SYNC); what |= MASK_TC_BIT(op_flags, SYNC);
what |= MASK_TC_BIT(op_flags, RAHEAD); what |= MASK_TC_BIT(op_flags, RAHEAD);
what |= MASK_TC_BIT(op_flags, META); what |= MASK_TC_BIT(op_flags, META);
what |= MASK_TC_BIT(op_flags, FLUSH); what |= MASK_TC_BIT(op_flags, PREFLUSH);
what |= MASK_TC_BIT(op_flags, FUA); what |= MASK_TC_BIT(op_flags, FUA);
if (op == REQ_OP_DISCARD) if (op == REQ_OP_DISCARD)
what |= BLK_TC_ACT(BLK_TC_DISCARD); what |= BLK_TC_ACT(BLK_TC_DISCARD);
@ -1779,7 +1780,7 @@ void blk_fill_rwbs(char *rwbs, int op, u32 rw, int bytes)
{ {
int i = 0; int i = 0;
if (rw & REQ_FLUSH) if (rw & REQ_PREFLUSH)
rwbs[i++] = 'F'; rwbs[i++] = 'F';
switch (op) { switch (op) {