Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: prevent merges of discard and write requests
This commit is contained in:
commit
56162badad
@ -361,6 +361,18 @@ static int attempt_merge(struct request_queue *q, struct request *req,
|
|||||||
if (!rq_mergeable(req) || !rq_mergeable(next))
|
if (!rq_mergeable(req) || !rq_mergeable(next))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Don't merge file system requests and discard requests
|
||||||
|
*/
|
||||||
|
if ((req->cmd_flags & REQ_DISCARD) != (next->cmd_flags & REQ_DISCARD))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Don't merge discard requests and secure discard requests
|
||||||
|
*/
|
||||||
|
if ((req->cmd_flags & REQ_SECURE) != (next->cmd_flags & REQ_SECURE))
|
||||||
|
return 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* not contiguous
|
* not contiguous
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user