diff options
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 8681cd6f9911..b92f5b0866b0 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
| @@ -222,27 +222,6 @@ new_segment: | |||
| 222 | } | 222 | } |
| 223 | EXPORT_SYMBOL(blk_rq_map_sg); | 223 | EXPORT_SYMBOL(blk_rq_map_sg); |
| 224 | 224 | ||
| 225 | static inline int ll_new_mergeable(struct request_queue *q, | ||
| 226 | struct request *req, | ||
| 227 | struct bio *bio) | ||
| 228 | { | ||
| 229 | int nr_phys_segs = bio_phys_segments(q, bio); | ||
| 230 | |||
| 231 | if (req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) { | ||
| 232 | req->cmd_flags |= REQ_NOMERGE; | ||
| 233 | if (req == q->last_merge) | ||
| 234 | q->last_merge = NULL; | ||
| 235 | return 0; | ||
| 236 | } | ||
| 237 | |||
| 238 | /* | ||
| 239 | * A hw segment is just getting larger, bump just the phys | ||
| 240 | * counter. | ||
| 241 | */ | ||
| 242 | req->nr_phys_segments += nr_phys_segs; | ||
| 243 | return 1; | ||
| 244 | } | ||
| 245 | |||
| 246 | static inline int ll_new_hw_segment(struct request_queue *q, | 225 | static inline int ll_new_hw_segment(struct request_queue *q, |
| 247 | struct request *req, | 226 | struct request *req, |
| 248 | struct bio *bio) | 227 | struct bio *bio) |
