svn commit: r255179 - head/sys/dev/xen/blkback

[Justin T. Gibbs]

Author: gibbs
Date: Tue Sep  3 13:49:00 2013
New Revision: 255179
URL: http://svnweb.freebsd.org/changeset/base/255179

Log:
  sys/dev/xen/blkback/blkback.c:
  	Initialize the request id for requests in xbb_get_resources()
  	instead of its previous location in xbb_dispatch_io().  This
  	guarantees that all request types (e.g. BLKIF_OP_FLUSH_DISKCACHE)
  	have the front-end specified id recorded.
  
  Submitted by:	Roger Pau Monné
  Sponsored by:	Citrix Systems R&D

Modified:
  head/sys/dev/xen/blkback/blkback.c

Modified: head/sys/dev/xen/blkback/blkback.c
==============================================================================
--- head/sys/dev/xen/blkback/blkback.c	Tue Sep  3 13:40:24 2013	(r255178)
+++ head/sys/dev/xen/blkback/blkback.c	Tue Sep  3 13:49:00 2013	(r255179)
@@ -1239,6 +1239,7 @@ xbb_get_resources(struct xbb_softc *xbb,
 
 	nreq->reqlist = *reqlist;
 	nreq->req_ring_idx = ring_idx;
+	nreq->id = ring_req->id;
 
 	if (xbb->abi != BLKIF_PROTOCOL_NATIVE) {
 		bcopy(ring_req, &nreq->ring_req_storage, sizeof(*ring_req));
@@ -1608,7 +1609,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, s
 		req_ring_idx	      = nreq->req_ring_idx;
 		nr_sects              = 0;
 		nseg                  = ring_req->nr_segments;
-		nreq->id              = ring_req->id;
 		nreq->nr_pages        = nseg;
 		nreq->nr_512b_sectors = 0;
 		req_seg_idx	      = 0;