projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...
[cascardo/linux.git]
/
drivers
/
scsi
/
sd.c
diff --git
a/drivers/scsi/sd.c
b/drivers/scsi/sd.c
index
f52b74c
..
428c03e
100644
(file)
--- a/
drivers/scsi/sd.c
+++ b/
drivers/scsi/sd.c
@@
-137,15
+137,15
@@
static const char *sd_cache_types[] = {
static void sd_set_flush_flag(struct scsi_disk *sdkp)
{
static void sd_set_flush_flag(struct scsi_disk *sdkp)
{
-
unsigned flush = 0
;
+
bool wc = false, fua = false
;
if (sdkp->WCE) {
if (sdkp->WCE) {
-
flush |= REQ_FLUSH
;
+
wc = true
;
if (sdkp->DPOFUA)
if (sdkp->DPOFUA)
- f
lush |= REQ_FUA
;
+ f
ua = true
;
}
}
- blk_queue_
flush(sdkp->disk->queue, flush
);
+ blk_queue_
write_cache(sdkp->disk->queue, wc, fua
);
}
static ssize_t
}
static ssize_t
@@
-779,7
+779,7
@@
static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
* discarded on disk. This allows us to report completion on the full
* amount of blocks described by the request.
*/
* discarded on disk. This allows us to report completion on the full
* amount of blocks described by the request.
*/
- blk_add_request_payload(rq, page, len);
+ blk_add_request_payload(rq, page,
0,
len);
ret = scsi_init_io(cmd);
rq->__data_len = nr_bytes;
ret = scsi_init_io(cmd);
rq->__data_len = nr_bytes;