From patchwork Sun Apr 17 11:27:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Herbszt X-Patchwork-Id: 8862701 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E0169F1D3 for ; Sun, 17 Apr 2016 11:27:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9046B20166 for ; Sun, 17 Apr 2016 11:27:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B0E02015A for ; Sun, 17 Apr 2016 11:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751498AbcDQL1V (ORCPT ); Sun, 17 Apr 2016 07:27:21 -0400 Received: from mout.gmx.net ([212.227.15.19]:52345 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbcDQL1U (ORCPT ); Sun, 17 Apr 2016 07:27:20 -0400 Received: from localhost ([92.208.116.232]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0LrvBu-1bu99Y1us2-013iUK; Sun, 17 Apr 2016 13:27:06 +0200 Date: Sun, 17 Apr 2016 13:27:27 +0200 From: Sebastian Herbszt To: linux-scsi@vger.kernel.org, James Smart , Dick Kennedy Cc: "James E.J. Bottomley" , "Martin K. Petersen" , Johannes Thumshirn , Sebastian Herbszt Subject: [PATCH] lpfc: remove incorrect lockdep assertion Message-ID: <20160417132727.000026f3@localhost> X-Mailer: Claws Mail 3.9.2-55-g74b05b (GTK+ 2.16.6; i586-pc-mingw32msvc) MIME-Version: 1.0 X-Provags-ID: V03:K0:0e0tWvhCrDDOIY+jWC6AagS4yWeNAdb60f8Vc7MPO+1lUOt7fbB yG/hqS377VgF+NkVxY4F11T00xEbD4vijv6yatOIma5GJDesYHHLklE6cSkS6UgLqTIYAI2 DcpQ5Ls1QTamPQ4+OVSOQnXhaaDmIOQl4cMRrfIIKwFboMq3nPn3qEEs7hRaI06z3EpndZI dRre7Z3Em3JlIS3rMVf2w== X-UI-Out-Filterresults: notjunk:1; V01:K0:rwhSz+s0b5g=:NDoUzNqYwjvlDJ9OBujxwv 9AS7NwLYFpYqdKOamioJnDTvIfU1wdkwnki2aVkIOcke5/jX1o5iNB/kfPrgQyWxWvGkYoQ+S lNAKEgy1do9h8fMQaXhi1S4rpq5EYKhrlZCP1g+ioFIIg32qeCQhnfH3B2/GBWuM1Ro2tSc7J BeWWX6x7+VIU9wDpk5PL3lgS3QIe/37cNs6qDUm+PL8cN+i6tOgi2QGGy0G+u2MjhgvAAw/H+ fQAJbLRuB6CyRCY93xj+kBcygpLnheNN8sskaf/Kpa7qBubYI/hZMkN8Ekpy9RQsaWEGTvwJu +5JuOfFQMoEspJXjn8/gX2hPj58JXS6fdd1NEdBjtGPxuMuCxUYPNZHsarRbRLZq827uQ9ITJ yQUBLj0qz1oGu7mmLfqEyWWfoarS9nMPe7Fh8N3H9/S7jifssbJFfiLcNjHTutl9oQPFoMift tMd8FCnBJTLGeRHQuqdH2x+1JsrB420k+VnzDxhmY5RkvQv2zQlKn19G9DgCCDJ1fsgOL2eIx thhrbps6yGmHGOCZn5fC98Qsmey2oAFznPvoHeUu0NSLm6hhZEA08lzNL5u6KnPj+5hRPfcoP OWBR/5mkhlBBWUFBTYN0MPDueh7OLg7+zsB1s5J0pYMigmg9Nqjdo2iBM7MMbjkoEy/plLQFN LPK+CKz0SSLMSFffF0BSOPq3tqxvZBTN6sz7OpHvaRcr8j9wtzE6o/0Kx2spdi68DPcZR0oj9 0QzCsVWE/NVraE0fHgpjTVSFo03jCZLwtG8EcagGNsViyjCDg8/tA0PlUiH3fKri9YtMyMQRO Ip2lRIh Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove incorrect lockdep assertion from lpfc_sli_hbqbuf_find() which acquires the hbalock itself. Fix the comment which resulted in this mistake. Fixes: 1c2ba475eb0e ("lpfc: Add lockdep assertions") Signed-off-by: Sebastian Herbszt Reviewed-by: Johannes Thumshirn --- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uNr -U 5 a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c --- a/drivers/scsi/lpfc/lpfc_sli.c 2016-03-15 03:25:44.324554218 +0100 +++ b/drivers/scsi/lpfc/lpfc_sli.c 2016-04-17 13:01:59.700182669 +0200 @@ -1998,24 +1998,21 @@ /** * lpfc_sli_hbqbuf_find - Find the hbq buffer associated with a tag * @phba: Pointer to HBA context object. * @tag: Tag of the hbq buffer. * - * This function is called with hbalock held. This function searches - * for the hbq buffer associated with the given tag in the hbq buffer - * list. If it finds the hbq buffer, it returns the hbq_buffer other wise - * it returns NULL. + * This function searches for the hbq buffer associated with the given tag in + * the hbq buffer list. If it finds the hbq buffer, it returns the hbq_buffer + * otherwise it returns NULL. **/ static struct hbq_dmabuf * lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag) { struct lpfc_dmabuf *d_buf; struct hbq_dmabuf *hbq_buf; uint32_t hbqno; - lockdep_assert_held(&phba->hbalock); - hbqno = tag >> 16; if (hbqno >= LPFC_MAX_HBQS) return NULL; spin_lock_irq(&phba->hbalock);