block: Don't merge requests if integrity flags differ

Browse source

We'd occasionally merge requests with conflicting integrity flags.
Introduce a merge helper which checks that the requests have compatible
integrity payloads.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

...

This commit is contained in:

Martin K. Petersen 2014-09-26 19:20:06 -04:00 • committed by Jens Axboe

parent aae7df5019

commit 4eaf99bead

3 changed files with 39 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

36

block/blk-integrity.c

View file

6

block/blk-merge.c

View file

20

include/linux/blkdev.h

View file