linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Remonda <adrianremonda@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Adrian Remonda <adrianremonda@gmail.com>,
	Oleg Drokin <oleg.drokin@intel.com>,
	Andreas Dilger <andreas.dilger@intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Julia Lawall <Julia.Lawall@lip6.fr>,
	Joe Perches <joe@perches.com>,
	Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
	Greg Donald <gdonald@gmail.com>,
	HPDD-discuss@ml01.01.org (moderated list:STAGING - LUSTRE...),
	devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 4/4] Staging: lustre: sparse lock warning fix
Date: Mon, 18 May 2015 20:34:51 +0200	[thread overview]
Message-ID: <1431974091-26363-5-git-send-email-adrianremonda@gmail.com> (raw)
In-Reply-To: <1431974091-26363-4-git-send-email-adrianremonda@gmail.com>

Fixed sparse warning: context imbalance in 'nrs_resource_put_safe' -
'different lock contexts for basic block' by releasing the lock on each
iteration of the for loop.

Signed-off-by: Adrian Remonda <adrianremonda@gmail.com>
---
 drivers/staging/lustre/lustre/ptlrpc/nrs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
index 43da95f0bce2..3a1722437ca1 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
@@ -503,13 +503,11 @@ static void nrs_resource_put_safe(struct ptlrpc_nrs_resource **resp)
 
 		if (nrs == NULL) {
 			nrs = pols[i]->pol_nrs;
-			spin_lock(&nrs->nrs_lock);
 		}
+		spin_lock(&nrs->nrs_lock);
 		nrs_policy_put_locked(pols[i]);
-	}
-
-	if (nrs != NULL)
 		spin_unlock(&nrs->nrs_lock);
+	}
 }
 
 /**
-- 
2.1.4


  reply	other threads:[~2015-05-18 18:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1431974091-26363-1-git-send-email-adrianremonda@gmail.com>
2015-05-18 18:34 ` [PATCH 1/4] Staging: lustre: sparse static warning fix Adrian Remonda
2015-05-18 18:34   ` [PATCH 2/4] " Adrian Remonda
2015-05-18 18:34     ` [PATCH 3/4] Staging: lustre: Fixed typo Adrian Remonda
2015-05-18 18:34       ` Adrian Remonda [this message]
2015-05-18 21:21         ` [PATCH 4/4] Staging: lustre: sparse lock warning fix Dan Carpenter
2015-05-20 16:51           ` Dilger, Andreas
2015-05-20 19:29             ` Dan Carpenter
2015-05-20 19:42               ` Dan Carpenter
2015-05-20 22:51                 ` Dilger, Andreas
2015-05-22 13:38                   ` Dan Carpenter
2015-05-21  8:15           ` AdrianRemonda
2015-05-21 15:12             ` Dan Carpenter
2015-05-21 15:33               ` Drokin, Oleg
2015-05-22  1:11                 ` Nikitas Angelinas
2015-05-18 21:23   ` [PATCH 1/4] Staging: lustre: sparse static " Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431974091-26363-5-git-send-email-adrianremonda@gmail.com \
    --to=adrianremonda@gmail.com \
    --cc=HPDD-discuss@ml01.01.org \
    --cc=Julia.Lawall@lip6.fr \
    --cc=andreas.dilger@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gdonald@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mahfouz.saif.elyazal@gmail.com \
    --cc=oleg.drokin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).