Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56162bad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e7553b19 f281fb5f

block/blk-merge.c

+12 −0
Original line number Diff line number Diff line
@@ -361,6 +361,18 @@ static int attempt_merge(struct request_queue *q, struct request *req, 
	if (!rq_mergeable(req) || !rq_mergeable(next))

		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

	 */