| commit | b973cb7e89fe3dcc2bc72c5b3aa7a3bfd9d0e6d5 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Thu Feb 02 08:54:40 2017 -0700 |
| committer | Jens Axboe <axboe@fb.com> | Fri Feb 03 09:47:32 2017 -0700 |
| tree | 8949e898cd4e87d63b6752ae8dfa36e1b461da77 | |
| parent | 9b54d816e00425c3a517514e0d677bb3cec49258 [diff] |
blk-merge: return the merged request When we attempt to merge request-to-request, we return a 0/1 if we ended up merging or not. Change that to return the pointer to the request that we freed. We will use this to move the freeing of that request out of the merge logic, so that callers can drop locks before freeing the request. There should be no functional changes in this patch. Signed-off-by: Jens Axboe <axboe@fb.com> Reviewed-by: Omar Sandoval <osandov@fb.com>