projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[deliverable/linux.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index b60537b2c35b4152343c0239374d8ba332865b09..2475b1c72773c53c0c60ebfb466929c82b2a0d2c 100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1523,6
+1523,7
@@
EXPORT_SYMBOL(blk_put_request);
* blk_add_request_payload - add a payload to a request
* @rq: request to update
* @page: page backing the payload
* blk_add_request_payload - add a payload to a request
* @rq: request to update
* @page: page backing the payload
+ * @offset: offset in page
* @len: length of the payload.
*
* This allows to later add a payload to an already submitted request by
* @len: length of the payload.
*
* This allows to later add a payload to an already submitted request by
@@
-1533,12
+1534,12
@@
EXPORT_SYMBOL(blk_put_request);
* discard requests should ever use it.
*/
void blk_add_request_payload(struct request *rq, struct page *page,
* discard requests should ever use it.
*/
void blk_add_request_payload(struct request *rq, struct page *page,
- unsigned int len)
+
int offset,
unsigned int len)
{
struct bio *bio = rq->bio;
bio->bi_io_vec->bv_page = page;
{
struct bio *bio = rq->bio;
bio->bi_io_vec->bv_page = page;
- bio->bi_io_vec->bv_offset =
0
;
+ bio->bi_io_vec->bv_offset =
offset
;
bio->bi_io_vec->bv_len = len;
bio->bi_iter.bi_size = len;
bio->bi_io_vec->bv_len = len;
bio->bi_iter.bi_size = len;
@@
-1963,7
+1964,8
@@
generic_make_request_checks(struct bio *bio)
* drivers without flush support don't have to worry
* about them.
*/
* drivers without flush support don't have to worry
* about them.
*/
- if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && !q->flush_flags) {
+ if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) &&
+ !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) {
bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA);
if (!nr_sectors) {
err = 0;
bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA);
if (!nr_sectors) {
err = 0;
This page took
0.038471 seconds
and
5
git commands to generate.