Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A set of fixes for this series. This contains:

   - Set of fixes for the nvme target code

   - A revert of patch from this merge window, causing a regression with
     WRITE_SAME on iSCSI targets at least.

   - A fix for a use-after-free in the new O_DIRECT bdev code.

   - Two fixes for the xen-blkfront driver"

* 'for-linus' of git://git.kernel.dk/linux-block:
  Revert "sd: remove __data_len hack for WRITE SAME"
  nvme-fc: use blk_rq_nr_phys_segments
  nvmet-rdma: Fix missing dma sync to nvme data structures
  nvmet: Call fatal_error from keep-alive timout expiration
  nvmet: cancel fatal error and flush async work before free controller
  nvmet: delete controllers deletion upon subsystem release
  nvmet_fc: correct logic in disconnect queue LS handling
  block: fix use after free in __blkdev_direct_IO
  xen-blkfront: correct maximum segment accounting
  xen-blkfront: feature flags handling adjustments

1 files changed, 1 insertions, 3 deletions

diff --git a/trafgen.c b/trafgen.c
index 78be711..1fdf0ec 100644
--- a/trafgen.c
+++ b/trafgen.c
@@ -928,9 +928,7 @@ static void xmit_packet_precheck(struct ctx *ctx, unsigned int cpu)
 
 static void pcap_load_packets(struct dev_io *dev)
 {
-	struct packet *pkt;
-
-	while ((pkt = dev_io_read(dev)) != 0)
+	while (dev_io_read(dev))
 		/* nothing to do */;
 }