diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-06-13 21:19:06 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-06-13 21:19:06 +0200 |
| commit | 987751719bd38a72dfd29f398dea1a7f3cd5b224 (patch) | |
| tree | a6a921813997caf7360771620667cdc2a83c99c1 /drivers/block/xen-blkback | |
| parent | umem: fix up unplugging (diff) | |
| parent | xen/blkfront: Add WARN to deal with misbehaving backends. (diff) | |
| download | linux-987751719bd38a72dfd29f398dea1a7f3cd5b224.tar.xz linux-987751719bd38a72dfd29f398dea1a7f3cd5b224.zip | |
Merge branch 'stable/for-jens-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Diffstat (limited to 'drivers/block/xen-blkback')
| -rw-r--r-- | drivers/block/xen-blkback/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index 773cf27dc23f..9ad3b5ec1dc1 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -257,6 +257,7 @@ static inline void blkif_get_x86_32_req(struct blkif_request *dst, break; case BLKIF_OP_DISCARD: dst->u.discard.flag = src->u.discard.flag; + dst->u.discard.id = src->u.discard.id; dst->u.discard.sector_number = src->u.discard.sector_number; dst->u.discard.nr_sectors = src->u.discard.nr_sectors; break; @@ -287,6 +288,7 @@ static inline void blkif_get_x86_64_req(struct blkif_request *dst, break; case BLKIF_OP_DISCARD: dst->u.discard.flag = src->u.discard.flag; + dst->u.discard.id = src->u.discard.id; dst->u.discard.sector_number = src->u.discard.sector_number; dst->u.discard.nr_sectors = src->u.discard.nr_sectors; break; |