On Wed, Feb 5, 2014 at 4:41 AM, Christoph Hellwig <hch@xxxxxxxxxxxxx> wrote: > Switch to using a preallocated flush_rq for blk-mq similar to what's done > with the old request path. This allows us to set up the request properly > with a tag from the actually allowed range and ->rq_disk as needed by > some drivers. To make life easier we also switch to dynamic allocation > of ->flush_rq for the old path. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > block/blk-core.c | 15 ++++++-- > block/blk-flush.c | 97 +++++++++++++++++------------------------------- > block/blk-mq.c | 26 ++++++------- > block/blk-mq.h | 1 + > block/blk-sysfs.c | 2 + > include/linux/blk-mq.h | 2 +- > include/linux/blkdev.h | 9 +---- > 7 files changed, 65 insertions(+), 87 deletions(-) > > diff --git a/block/blk-core.c b/block/blk-core.c > index c00e0bd..d3eb330 100644 > --- a/block/blk-core.c > +++ b/block/blk-core.c > @@ -693,11 +693,20 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) > if (!uninit_q) > return NULL; > > + uninit_q->flush_rq = kzalloc(sizeof(struct request), GFP_KERNEL); Shouldn't this be kzalloc_node()? Rest in this patch looks ok... -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html