Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -649,6 +649,8 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
|
||||
unsigned long secure;
|
||||
struct phys_req preq;
|
||||
|
||||
xen_blkif_get(blkif);
|
||||
|
||||
preq.sector_number = req->u.discard.sector_number;
|
||||
preq.nr_sects = req->u.discard.nr_sectors;
|
||||
|
||||
@@ -661,7 +663,6 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
|
||||
}
|
||||
blkif->st_ds_req++;
|
||||
|
||||
xen_blkif_get(blkif);
|
||||
secure = (blkif->vbd.discard_secure &&
|
||||
(req->u.discard.flag & BLKIF_DISCARD_SECURE)) ?
|
||||
BLKDEV_DISCARD_SECURE : 0;
|
||||
|
||||
Reference in New Issue
Block a user