projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for...
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index 77b7c26df6b50fea7a38ba0825d91583f1c4031c..74bc4a768f32e0f01e5c43f100f8663eea34c3a4 100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-21,7
+21,7
@@
static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
return 0;
fbio = bio;
return 0;
fbio = bio;
- cluster =
test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags
);
+ cluster =
blk_queue_cluster(q
);
seg_size = 0;
nr_phys_segs = 0;
for_each_bio(bio) {
seg_size = 0;
nr_phys_segs = 0;
for_each_bio(bio) {
@@
-87,7
+87,7
@@
EXPORT_SYMBOL(blk_recount_segments);
static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
struct bio *nxt)
{
static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
struct bio *nxt)
{
- if (!
test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags
))
+ if (!
blk_queue_cluster(q
))
return 0;
if (bio->bi_seg_back_size + nxt->bi_seg_front_size >
return 0;
if (bio->bi_seg_back_size + nxt->bi_seg_front_size >
@@
-123,7
+123,7
@@
int blk_rq_map_sg(struct request_queue *q, struct request *rq,
int nsegs, cluster;
nsegs = 0;
int nsegs, cluster;
nsegs = 0;
- cluster =
test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags
);
+ cluster =
blk_queue_cluster(q
);
/*
* for each bio in rq
/*
* for each bio in rq