summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2018-03-29 15:26:48 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-23 14:46:39 +0200
commit186ae2f38ac2761068316a75a58344d59b54b8f9 (patch)
treece503ef97c6043e1edb513623fa85acd7e3e5837
parent40fbffd9b9a110b7b1eb9e4fb609018d29dff157 (diff)
downloadop-kernel-dev-186ae2f38ac2761068316a75a58344d59b54b8f9.zip
op-kernel-dev-186ae2f38ac2761068316a75a58344d59b54b8f9.tar.gz
staging: lustre: remove invariant in cl_io_read_ahead()
This invariant can fail as ci_type is somtimes CIS_INIT. According to Jinshan Xiong, or of the most recent significant change to this code, "We should get rid of it." So do that. Fixes: 1e1db2a97be5 ("staging: lustre: clio: Revise read ahead implementation") Cc: Jinshan Xiong <jinshan.xiong@intel.com> Signed-off-by: NeilBrown <neilb@suse.com> Reviewed-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/obdclass/cl_io.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index ab84e01..fcdae60 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -599,7 +599,6 @@ int cl_io_read_ahead(const struct lu_env *env, struct cl_io *io,
int result = 0;
LINVRNT(io->ci_type == CIT_READ || io->ci_type == CIT_FAULT);
- LINVRNT(io->ci_state == CIS_IO_GOING || io->ci_state == CIS_LOCKED);
LINVRNT(cl_io_invariant(io));
cl_io_for_each(scan, io) {
OpenPOWER on IntegriCloud