blk-merge: return the merged request

Browse source

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>

...

This commit is contained in:

Jens Axboe 2017-02-02 08:54:40 -07:00

parent 9b54d816e0

commit b973cb7e89

2 changed files with 18 additions and 17 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

31

block/blk-merge.c

View file

4

block/blk.h

View file