Commit 92a56555 authored Aug 05, 2014 by David Jeffery Committed by Trond Myklebust Aug 22, 2014

nfs: Don't busy-wait on SIGKILL in __nfs_iocounter_wait



If a SIGKILL is sent to a task waiting in __nfs_iocounter_wait,
it will busy-wait or soft lockup in its while loop.
nfs_wait_bit_killable won't sleep, and the loop won't exit on
the error return.

Stop the busy-wait by breaking out of the loop when
nfs_wait_bit_killable returns an error.

Signed-off-by: David Jeffery <djeffery@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 78270e8f

fs/nfs/pagelist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ __nfs_iocounter_wait(struct nfs_io_counter *c)
		if (atomic_read(&c->io_count) == 0)
		break;
		ret = nfs_wait_bit_killable(&q.key);
		} while (atomic_read(&c->io_count) != 0);
		} while (atomic_read(&c->io_count) != 0 && !ret);
		finish_wait(wq, &q.wait);
		return ret;
		}

Admin message