[Drbd-dev] [PATCH v2] drbd: clean reference to old kernels

[Lars Ellenberg]

On Thu, Jan 13, 2011 at 04:27:01PM +0200, Or Gerlitz wrote:
> drop ifdef which is relevant to 2.6.28 and below
> 
> Signed-off-by: Or Gerlitz <ogerlitz at voltaire.com>
> ---

Thanks for spotting and fixing this.

	Lars

> changes from v1:
> 	the call now collapsed into a single line
> 
> diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
> index 11a75d3..6496b32 100644
> --- a/drivers/block/drbd/drbd_req.c
> +++ b/drivers/block/drbd/drbd_req.c
> @@ -1073,11 +1073,7 @@ int drbd_make_request_26(struct request_queue *q, struct bio *bio)
>  		const int sps = 1 << HT_SHIFT; /* sectors per slot */
>  		const int mask = sps - 1;
>  		const sector_t first_sectors = sps - (sect & mask);
> -		bp = bio_split(bio,
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
> -				bio_split_pool,
> -#endif
> -				first_sectors);
> +		bp = bio_split(bio, first_sectors);
> 
>  		/* we need to get a "reference count" (ap_bio_cnt)
>  		 * to avoid races with the disconnect/reconnect/suspend code.