mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Finish renaming REQ_DISCARD into REQ_OP_DISCARD

Browse source 
Some time ago REQ_DISCARD was renamed into REQ_OP_DISCARD. Some comments
and documentation files were not updated however. Update these comments
and documentation files. See also commit 4e1b2d52a8 ("block, fs,
drivers: remove REQ_OP compat defs and related code").

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2018-10-03 13:56:25 -07:00 committed by Jens Axboe
parent e4f3aa2e1e
commit 9305455acf
8 changed files with 11 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/blockdev/zram.txt
View file

@ -190,7 +190,7 @@ whitespace:
notify_free Depending on device usage scenario it may account notify_free Depending on device usage scenario it may account
a) the number of pages freed because of swap slot free a) the number of pages freed because of swap slot free
notifications or b) the number of pages freed because of notifications or b) the number of pages freed because of
REQ_DISCARD requests sent by bio. The former ones are REQ_OP_DISCARD requests sent by bio. The former ones are
sent to a swap block device when a swap slot is freed, sent to a swap block device when a swap slot is freed,
which implies that this disk is being used as a swap disk. which implies that this disk is being used as a swap disk.
The latter ones are sent by filesystem mounted with The latter ones are sent by filesystem mounted with

2
Documentation/device-mapper/log-writes.txt
View file

@ -38,7 +38,7 @@ inconsistent file system.
Any REQ_FUA requests bypass this flushing mechanism and are logged as soon as Any REQ_FUA requests bypass this flushing mechanism and are logged as soon as
they complete as those requests will obviously bypass the device cache. they complete as those requests will obviously bypass the device cache.
Any REQ_DISCARD requests are treated like WRITE requests. Otherwise we would Any REQ_OP_DISCARD requests are treated like WRITE requests. Otherwise we would
have all the DISCARD requests, and then the WRITE requests and then the FLUSH have all the DISCARD requests, and then the WRITE requests and then the FLUSH
request. Consider the following example: request. Consider the following example:

2
drivers/block/drbd/drbd_int.h
View file

@ -429,7 +429,7 @@ enum {
__EE_CALL_AL_COMPLETE_IO, __EE_CALL_AL_COMPLETE_IO,
__EE_MAY_SET_IN_SYNC, __EE_MAY_SET_IN_SYNC,
/* is this a TRIM aka REQ_DISCARD? */ /* is this a TRIM aka REQ_OP_DISCARD? */
__EE_IS_TRIM, __EE_IS_TRIM,
/* In case a barrier failed, /* In case a barrier failed,

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

@ -1673,7 +1673,7 @@ static u32 bio_flags_to_wire(struct drbd_connection *connection,
return bio->bi_opf & REQ_SYNC ? DP_RW_SYNC : 0; return bio->bi_opf & REQ_SYNC ? DP_RW_SYNC : 0;
} }
/* Used to send write or TRIM aka REQ_DISCARD requests /* Used to send write or TRIM aka REQ_OP_DISCARD requests
* R_PRIMARY -> Peer (P_DATA, P_TRIM) * R_PRIMARY -> Peer (P_DATA, P_TRIM)
*/ */
int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *req) int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *req)

4
drivers/block/drbd/drbd_protocol.h
View file

@ -57,7 +57,7 @@ enum drbd_packet {
P_PROTOCOL_UPDATE = 0x2d, /* data sock: is used in established connections */ P_PROTOCOL_UPDATE = 0x2d, /* data sock: is used in established connections */
/* 0x2e to 0x30 reserved, used in drbd 9 */ /* 0x2e to 0x30 reserved, used in drbd 9 */
/* REQ_DISCARD. We used "discard" in different contexts before, /* REQ_OP_DISCARD. We used "discard" in different contexts before,
* which is why I chose TRIM here, to disambiguate. */ * which is why I chose TRIM here, to disambiguate. */
P_TRIM = 0x31, P_TRIM = 0x31,
@ -126,7 +126,7 @@ struct p_header100 {
#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_PREFLUSH */ #define DP_FLUSH 32 /* equals REQ_PREFLUSH */
#define DP_DISCARD 64 /* equals REQ_DISCARD */ #define DP_DISCARD 64 /* equals REQ_OP_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 */
#define DP_WSAME 512 /* equiv. REQ_WRITE_SAME */ #define DP_WSAME 512 /* equiv. REQ_WRITE_SAME */

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

@ -650,7 +650,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
case DISCARD_COMPLETED_NOTSUPP: case DISCARD_COMPLETED_NOTSUPP:
case DISCARD_COMPLETED_WITH_ERROR: case DISCARD_COMPLETED_WITH_ERROR:
/* I'd rather not detach from local disk just because it /* I'd rather not detach from local disk just because it
* failed a REQ_DISCARD. */ * failed a REQ_OP_DISCARD. */
mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED); mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED);
break; break;

2
drivers/block/drbd/drbd_worker.c
View file

@ -152,7 +152,7 @@ void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req) __releases(l
do_wake = list_empty(block_id == ID_SYNCER ? &device->sync_ee : &device->active_ee); do_wake = list_empty(block_id == ID_SYNCER ? &device->sync_ee : &device->active_ee);
/* FIXME do we want to detach for failed REQ_DISCARD? /* FIXME do we want to detach for failed REQ_OP_DISCARD?
* ((peer_req->flags & (EE_WAS_ERROR|EE_IS_TRIM)) == EE_WAS_ERROR) */ * ((peer_req->flags & (EE_WAS_ERROR|EE_IS_TRIM)) == EE_WAS_ERROR) */
if (peer_req->flags & EE_WAS_ERROR) if (peer_req->flags & EE_WAS_ERROR)
__drbd_chk_io_error(device, DRBD_WRITE_ERROR); __drbd_chk_io_error(device, DRBD_WRITE_ERROR);

6
drivers/target/target_core_spc.c
View file

@ -636,9 +636,9 @@ spc_emulate_evpd_b2(struct se_cmd *cmd, unsigned char *buf)
/* /*
* The unmap_zeroes_data set means that the underlying device supports * The unmap_zeroes_data set means that the underlying device supports
* REQ_DISCARD and has the discard_zeroes_data bit set. This satisfies * REQ_OP_DISCARD and has the discard_zeroes_data bit set. This
* the SBC requirements for LBPRZ, meaning that a subsequent read * satisfies the SBC requirements for LBPRZ, meaning that a subsequent
* will return zeroes after an UNMAP or WRITE SAME (16) to an LBA * read will return zeroes after an UNMAP or WRITE SAME (16) to an LBA
* See sbc4r36 6.6.4. * See sbc4r36 6.6.4.
*/ */
if (((dev->dev_attrib.emulate_tpu != 0) || if (((dev->dev_attrib.emulate_tpu != 0) ||