diff options
author | Jens Axboe <axboe@fb.com> | 2017-02-02 16:54:40 +0100 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-02-03 17:47:32 +0100 |
commit | b973cb7e89fe3dcc2bc72c5b3aa7a3bfd9d0e6d5 (patch) | |
tree | 8949e898cd4e87d63b6752ae8dfa36e1b461da77 /arch | |
parent | blkcg: fix double free of new_blkg in blkcg_init_queue (diff) | |
download | linux-b973cb7e89fe3dcc2bc72c5b3aa7a3bfd9d0e6d5.tar.xz linux-b973cb7e89fe3dcc2bc72c5b3aa7a3bfd9d0e6d5.zip |
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>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions