Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c647b0e authored by Bob Liu's avatar Bob Liu Committed by Konrad Rzeszutek Wilk
Browse files

xen-blkfront: fix places not updated after introducing 64KB page granularity 



Two places didn't get updated when 64KB page granularity was introduced,
this patch fix them.

Signed-off-by: default avatarBob Liu <bob.liu@oracle.com>
Acked-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 1b856086

drivers/block/xen-blkfront.c

+2 −2
Original line number Diff line number Diff line
@@ -1315,7 +1315,7 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 
			rinfo->ring_ref[i] = GRANT_INVALID_REF;

		}

	}

	free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * PAGE_SIZE));

	free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * XEN_PAGE_SIZE));

	rinfo->ring.sring = NULL;



	if (rinfo->irq)
@@ -2008,7 +2008,7 @@ static int blkif_recover(struct blkfront_info *info) 


	blkfront_gather_backend_features(info);

	segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST;

	blk_queue_max_segments(info->rq, segs);

	blk_queue_max_segments(info->rq, segs / GRANTS_PER_PSEG);



	for (r_index = 0; r_index < info->nr_rings; r_index++) {

		struct blkfront_ring_info *rinfo = &info->rinfo[r_index];