On 05/03/13 22:53, Konrad Rzeszutek Wilk wrote: >>>>>> >>>>>> /* No more gnttab callback work. */ >>>>>> gnttab_cancel_free_callback(&info->callback); >>>>>> @@ -1088,6 +1120,12 @@ again: >>>>>> goto destroy_blkring; >>>>>> } >>>>>> >>>>>> + /* Allocate memory for grants */ >>>>>> + err = fill_grant_buffer(info, BLK_RING_SIZE * >>>>>> + BLKIF_MAX_SEGMENTS_PER_REQUEST); >>>>>> + if (err) >>>>>> + goto out; >>>>> >>>>> That looks to be in the wrong function - talk_to_blkback function is >>>>> to talk to the blkback. Not do initialization type operations. >>>> >>>> Yes, I know it's not the best place to place it. It's here mainly >>>> because that's the only function that gets called by both driver >>>> initialization and resume. >>>> >>>> Last patch moves this to a more sensible place. >>> >>> Lets make it part of this patch from the start. We still have two >>> months of time before the next merge window opens - so we have >>> time to make it nice and clean. >> >> I'm moving this to blkfront_setup_indirect in a later patch (because >> this function doesn't yet exist at this point), but I can put it in a >> more suitable place in this patch. >>
I will place it in setup_blkring, which is the place where we also init the sg array and it's called by both init and resume paths. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/