Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
and update a test that uses it. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>