diff options
| author | Wunderlich, Mark <mark.wunderlich@intel.com> | 2019-09-18 23:36:37 +0000 |
|---|---|---|
| committer | Sagi Grimberg <sagi@grimberg.me> | 2019-09-25 12:53:14 -0700 |
| commit | ddef29578a81a1d4d8f2b26a7adbfe21407ee3ea (patch) | |
| tree | 2a43810ecbbdd883409f29d2e2cc169770149044 | |
| parent | b224726de5e496dbf78147a66755c3d81e28bdd2 (diff) | |
| download | linux-stable-ddef29578a81a1d4d8f2b26a7adbfe21407ee3ea.tar.gz linux-stable-ddef29578a81a1d4d8f2b26a7adbfe21407ee3ea.tar.bz2 linux-stable-ddef29578a81a1d4d8f2b26a7adbfe21407ee3ea.zip | |
nvme-tcp: fix wrong stop condition in io_work
Allow the do/while statement to continue if current time
is not after the proposed time 'deadline'. Intent is to
allow loop to proceed for a specific time period. Currently
the loop, as coded, will exit after first pass.
Signed-off-by: Mark Wunderlich <mark.wunderlich@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
| -rw-r--r-- | drivers/nvme/host/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4ffd5957637a..385a5212c10f 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1042,7 +1042,7 @@ static void nvme_tcp_io_work(struct work_struct *w) { struct nvme_tcp_queue *queue = container_of(w, struct nvme_tcp_queue, io_work); - unsigned long start = jiffies + msecs_to_jiffies(1); + unsigned long deadline = jiffies + msecs_to_jiffies(1); do { bool pending = false; @@ -1067,7 +1067,7 @@ static void nvme_tcp_io_work(struct work_struct *w) if (!pending) return; - } while (time_after(jiffies, start)); /* quota is exhausted */ + } while (!time_after(jiffies, deadline)); /* quota is exhausted */ queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work); } |