Message ID | 20210122135736.173341247@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 935A4C433E0 for <stable@archiver.kernel.org>; Fri, 22 Jan 2021 14:21:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 612DC23A80 for <stable@archiver.kernel.org>; Fri, 22 Jan 2021 14:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728496AbhAVOVB (ORCPT <rfc822;stable@archiver.kernel.org>); Fri, 22 Jan 2021 09:21:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:38816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728487AbhAVOSu (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 22 Jan 2021 09:18:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FE0023A7E; Fri, 22 Jan 2021 14:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611324836; bh=psplj7E6pbRF0VvFZdW6Qy+OBViV4uIQvI+KMFyV4bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ys1DtBfvFVMYiy2fvhwdZP3muswNE07MgqHGptDJICwXu9sGPDUj/xTzw5D+r2DMD 29QANjD/eb2iTfIbewrc76NnPxHb1viEDIDbkZ9LLW5ejtTWO2A6cAPUZ1LUjxxKSV DmUr+QgpACKMFhN9Ppz6WZWLvA26VdxXfisWgx7M= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Trond Myklebust <trond.myklebust@hammerspace.com> Subject: [PATCH 4.14 24/50] NFS: nfs_igrab_and_active must first reference the superblock Date: Fri, 22 Jan 2021 15:12:05 +0100 Message-Id: <20210122135736.173341247@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210122135735.176469491@linuxfoundation.org> References: <20210122135735.176469491@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -575,12 +575,14 @@ extern int nfs4_test_session_trunk(struc static inline struct inode *nfs_igrab_and_active(struct inode *inode) { - inode = igrab(inode); - if (inode != NULL && !nfs_sb_active(inode->i_sb)) { - iput(inode); - inode = NULL; + struct super_block *sb = inode->i_sb; + + if (sb && nfs_sb_active(sb)) { + if (igrab(inode)) + return inode; + nfs_sb_deactive(sb); } - return inode; + return NULL; } static inline void nfs_iput_and_deactive(struct inode *inode)