projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aae7df5) | patch
block: Don't merge requests if integrity flags differ
authorMartin K. Petersen <[email protected]>
Fri, 26 Sep 2014 23:20:06 +0000 (19:20 -0400)
committerJens Axboe <[email protected]>
Sat, 27 Sep 2014 15:14:57 +0000 (09:14 -0600)
commit4eaf99beadcefbf126fa05e66fb40fca999e09fd
treee91203868eb48cdf06dd575e7d3f3569d6b6bfc9tree | snapshot
parentaae7df50190a640e51bfe11c93f94741ac82ff0bcommit | diff
block: Don't merge requests if integrity flags differ

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 <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Reviewed-by: Sagi Grimberg <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
block/blk-integrity.c diff | blob | history
block/blk-merge.c diff | blob | history
include/linux/blkdev.h diff | blob | history
John Crispins staging tree