On Thu, Feb 02, 2017 at 09:06:12AM -0700, Jens Axboe wrote: > 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. Reviewed-by: Omar Sandoval <osandov@xxxxxx> > Signed-off-by: Jens Axboe <axboe@xxxxxx> > --- > block/blk-merge.c | 31 ++++++++++++++++--------------- > block/blk.h | 4 ++-- > 2 files changed, 18 insertions(+), 17 deletions(-)
