From b4608c470a0f57133fd258f152c254a44222b24b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 6 Jan 2013 13:16:18 +0000
Subject: [PATCH] fcst: Avoid "suspicious RCU usage" warnings with lockdep
 enabled (merge r4378 and r4381 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4696 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/ft_sess.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c
index 02f9dd9e8..c0e62f1ed 100644
--- a/fcst/ft_sess.c
+++ b/fcst/ft_sess.c
@@ -48,7 +48,12 @@ static struct ft_tport *ft_tport_create(struct fc_lport *lport)
 	ft_format_wwn(name, sizeof(name), lport->wwpn);
 	FT_SESS_DBG("create %s\n", name);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
+	tport = rcu_dereference_protected(lport->prov[FC_TYPE_FCP],
+					  lockdep_is_held(&ft_lport_lock));
+#else
 	tport = rcu_dereference(lport->prov[FC_TYPE_FCP]);
+#endif
 	if (tport) {
 		FT_SESS_DBG("tport alloc %s - already setup\n", name);
 		return tport;