[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [dm-devel] linux-next oops



Mikulas Patocka writes:
>
> Try this. In my original patch that I sent, I removed bio_alloc_bioset and 
> left __bio_clone. But meanwhile, Kent Overstreet sent another patch that 
> replaces both bio_alloc_bioset and __bio_clone with bio_clone_bioset. The 
> reason for this crash is incorrect resolution of this conflict - 
> bio_clone_bioset was removed (although my patch removed only 
> bio_alloc_bioset) and __bio_clone was not added back.
> 
> Mikulas
> 
> ---
>  drivers/md/dm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-next-copy/drivers/md/dm.c
> ===================================================================
> --- linux-next-copy.orig/drivers/md/dm.c	2012-10-11 02:55:34.000000000 +0200
> +++ linux-next-copy/drivers/md/dm.c	2012-10-11 02:55:58.000000000 +0200
> @@ -1160,7 +1160,7 @@ static void __issue_target_request(struc
>  	 * ci->bio->bi_max_vecs is BIO_INLINE_VECS anyway, for both flush
>  	 * and discard, so no need for concern about wasted bvec allocations.
>  	 */
> -
> +	__bio_clone(clone, ci->bio);
>  	if (len) {
>  		clone->bi_sector = ci->sector;
>  		clone->bi_size = to_bytes(len);
> 


Yes, this fixes the crashes for me.

-- 
Bill


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]