blk-merge.c (2d4b3f37ded8998a362c8d0b4be02f583dd9a002) | blk-merge.c (7ba1ba12eeef0aa7113beb16410ef8b7c748e18b) |
---|---|
1/* 2 * Functions related to segment and merge handling 3 */ 4#include <linux/kernel.h> 5#include <linux/module.h> 6#include <linux/bio.h> 7#include <linux/blkdev.h> 8#include <linux/scatterlist.h> --- 427 unchanged lines hidden (view full) --- 436 if (req->sector + req->nr_sectors != next->sector) 437 return 0; 438 439 if (rq_data_dir(req) != rq_data_dir(next) 440 || req->rq_disk != next->rq_disk 441 || next->special) 442 return 0; 443 | 1/* 2 * Functions related to segment and merge handling 3 */ 4#include <linux/kernel.h> 5#include <linux/module.h> 6#include <linux/bio.h> 7#include <linux/blkdev.h> 8#include <linux/scatterlist.h> --- 427 unchanged lines hidden (view full) --- 436 if (req->sector + req->nr_sectors != next->sector) 437 return 0; 438 439 if (rq_data_dir(req) != rq_data_dir(next) 440 || req->rq_disk != next->rq_disk 441 || next->special) 442 return 0; 443 |
444 if (blk_integrity_rq(req) != blk_integrity_rq(next)) 445 return 0; 446 |
|
444 /* 445 * If we are allowed to merge, then append bio list 446 * from next to rq and release next. merge_requests_fn 447 * will have updated segment counts, update sector 448 * counts here. 449 */ 450 if (!ll_merge_requests_fn(q, req, next)) 451 return 0; --- 53 unchanged lines hidden --- | 447 /* 448 * If we are allowed to merge, then append bio list 449 * from next to rq and release next. merge_requests_fn 450 * will have updated segment counts, update sector 451 * counts here. 452 */ 453 if (!ll_merge_requests_fn(q, req, next)) 454 return 0; --- 53 unchanged lines hidden --- |