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

Groups > linux.kernel > #1224509

[PATCH 09/19] staging/lustre/osc: LBUG in osc_lru_reclaim

Show all headers | View raw

From: Hiroya Nozaki <nozaki.hiroya@jp.fujitsu.com>

LASSERT touches cl_client_cache->ccc_lru without any protection.
So this patch the LASSERT moves to the section protected by
cl_client_cache->ccc_lru_lock

Signed-off-by: Hiroya Nozaki <nozaki.hiroya@jp.fujitsu.com>
Reviewed-on: http://review.whamcloud.com/14901
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6624
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
---
 drivers/staging/lustre/lustre/osc/osc_page.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c
index 856d859..2af3232 100644
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@ -818,7 +818,6 @@ static int osc_lru_reclaim(struct client_obd *cli)
 	int rc;
 
 	LASSERT(cache != NULL);
-	LASSERT(!list_empty(&cache->ccc_lru));
 
 	rc = osc_lru_shrink(cli, lru_shrink_min);
 	if (rc != 0) {
@@ -835,6 +834,8 @@ static int osc_lru_reclaim(struct client_obd *cli)
 	/* Reclaim LRU slots from other client_obd as it can't free enough
 	 * from its own. This should rarely happen. */
 	spin_lock(&cache->ccc_lru_lock);
+	LASSERT(!list_empty(&cache->ccc_lru));
+
 	cache->ccc_lru_shrinkers++;
 	list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru);
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCH 00/19] Lustre fixes green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 05/19] staging/lustre/ptlrpc: remove LUSTRE_MSG_MAGIC_V1 support green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 13/19] staging/lustre/llite: ASSERTION( atomic_read(&d->ld_ref) == 0 ) failed green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 07/19] staging/lustre/llite: deny non-root user for changelog operations green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 15/19] staging/lustre: Remove unused MAY_ constants green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 14/19] staging/lustre/obdclass: Eliminate hash bucket scans in lu_cache_shrink green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 09/19] staging/lustre/osc: LBUG in osc_lru_reclaim green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 18/19] staging/lustre/libcfs: remove unused cfs_timer_done green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 02/19] staging/lustre/obdclass: reorganize busy object accounting green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 17/19] staging/lustre/o2iblnd: leak cmid in kiblnd_dev_need_failover green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 10/19] staging/lustre/libcfs: minor fix in cfs_hash_for_each_relax() green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 01/19] staging/lustre/lnet: Reenable lnet router debugfs green@linuxhacker.ru - 2015-09-15 00:50 +0200
  [PATCH 16/19] staging/lustre/osc: use global osc_rq_pool to reduce memory usage green@linuxhacker.ru - 2015-09-15 00:50 +0200

csiph-web