Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1374754

[PATCH 11/17] staging: lustre: osc: osc_extent_wait() shouldn't be interruptible

From James Simmons <jsimmons@infradead.org>
Newsgroups linux.kernel
Subject [PATCH 11/17] staging: lustre: osc: osc_extent_wait() shouldn't be interruptible
Date 2016-04-10 15:20 +0200
Message-ID <rmnrs-5Be-15@gated-at.bofh.it> (permalink)
References <rmnrr-5Be-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Jinshan Xiong <jinshan.xiong@intel.com>

Otherwise it will hit the assertion at cl_lock.c:

 cl_lock.c:1967:discard_cb())
  ASSERTION( (!(page->cp_type == CPT_CACHEABLE) ||
  (!PageWriteback(cl_page_vmpage(env, page)))) ) failed:

This is because in osc_lock_flush() we have to make sure the IO
is finished before discarding the pages.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2779
Reviewed-on: http://review.whamcloud.com/5419
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 drivers/staging/lustre/lustre/osc/osc_cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index 846be76..a341160 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -965,7 +965,7 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
 			"%s: wait ext to %d timedout, recovery in progress?\n",
 			osc_export(obj)->exp_obd->obd_name, state);
 
-		lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
+		lwi = LWI_INTR(NULL, NULL);
 		rc = l_wait_event(ext->oe_waitq, extent_wait_cb(ext, state),
 				  &lwi);
 	}
-- 
1.7.1

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/17] staging : lustre : rest of missing patches from 2.5.0 release James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 11/17] staging: lustre: osc: osc_extent_wait() shouldn't be interruptible James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 15/17] staging: lustre: lov: Don't wait for active target with OBD_STATFS_NODELAY James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 03/17] staging: lustre: ldlm: Fix a race during FLock handling James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 10/17] staging: lustre: llite: Truncate to restore file James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 02/17] staging: lustre: clio: incorrect assertions in 'enable-invariants' James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 17/17] staging: lustre: hsm: don't use real suppgid James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 09/17] staging: lustre: ptlrpc: return a meaningful status from ptlrpcd_init() James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 06/17] staging: lustre: llite: speedup in unlink/rmdir James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 08/17] staging: lustre: obd: MDT mount fails on MDS w/o MGS on it James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 04/17] staging: lustre: ldlm: refine LU-2665 patch for POSIX compliance James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 14/17] staging: lustre: lov: return minimal FIEMAP for released files James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200
  [PATCH 12/17] staging: lustre: lprocfs: implement log2 using bitops James Simmons <jsimmons@infradead.org> - 2016-04-10 15:20 +0200

csiph-web