diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-12-29 12:06:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-12-29 12:06:06 +0100 |
| commit | 7b1717fd47d6113f0cf28e82f7d0dc80e0b05621 (patch) | |
| tree | e87f5757d99ade0e3674f4f50bd9fef4cce98615 /drivers/block/xen-blkfront.c | |
| parent | 342cab29518f544fafe2d0a2a60398bdbda888b1 (diff) | |
| parent | 76d42990efb4902de293be254f5e93c693058c8f (diff) | |
Merge 4.4.297 into android-4.4-p
Changes in 4.4.297
net: usb: lan78xx: add Allied Telesis AT29M2-AF
can: kvaser_usb: get CAN clock frequency from device
HID: holtek: fix mouse probing
IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()
qlcnic: potential dereference null pointer of rx_queue->page_ring
bonding: fix ad_actor_system option setting to default
drivers: net: smc911x: Check for error irq
hwmon: (lm90) Fix usage of CONFIG2 register in detect function
ALSA: jack: Check the return value of kstrdup()
ALSA: drivers: opl3: Fix incorrect use of vp->state
ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
xen/blkfront: fix bug in backported patch
ax25: NPD bug when detaching AX25 device
hamradio: defer ax25 kfree after unregister_netdev
hamradio: improve the incomplete fix to avoid NPD
phonet/pep: refuse to enable an unbound pipe
Linux 4.4.297
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia0deae00fbc04da8f303ac61ade61ccb584542e2
Diffstat (limited to 'drivers/block/xen-blkfront.c')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 1e44b7880200..ae2c47e99c88 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -493,8 +493,6 @@ static int blkif_queue_discard_req(struct request *req) else ring_req->u.discard.flag = 0; - info->ring.req_prod_pvt++; - /* Copy the request to the ring page. */ *final_ring_req = *ring_req; info->shadow[id].inflight = true; @@ -711,8 +709,6 @@ static int blkif_queue_rw_req(struct request *req) if (setup.segments) kunmap_atomic(setup.segments); - info->ring.req_prod_pvt++; - /* Copy request(s) to the ring page. */ *final_ring_req = *ring_req; info->shadow[id].inflight = true; |