Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1770985pxb; Thu, 16 Sep 2021 15:25:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIAito619QwnW+Gq0Hj/tgpFCDu/HwMqjZjzNP/eQuSdABQ2fCC3NitYTy2C3ldjTgqx8Y X-Received: by 2002:a17:906:ece4:: with SMTP id qt4mr8884202ejb.250.1631831147102; Thu, 16 Sep 2021 15:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631831147; cv=none; d=google.com; s=arc-20160816; b=dfquoGBgGf1Zta0uBS6QK8m75U3I4M+DKgl9kf6T59pVIo6A36IiOZO6vE8NdCcVTF V3ol255ncFL09KdrhaI6er32tpRJ753cTdyasftj8lwwgwjf0lFLnObMwAR+oS148P70 7fB0YAXKlDBNVE5/lbixHEVh3hUaxOKeI6jrjwCgoDbGWDQ5Y6HBqyk3or2kGPuv4ZSz XCqcCb2g3Rthp1+5RX6Lc5d6P4sbyA7xK/cju3f+OnRS4Cki4lQsXVrIDuj0PNSK25V1 ivuRB7srP0Y3lZcNiuI0pq8Tysf3g2DKNFn+LGsyBjHY/yDXOIhlLePNjZpaOg1Pb8JD 5K9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7vCCxLEXtT6qW0Fpn2kgtjsRzjt0tXX14zAWtNInr7g=; b=V9dridp89+dY2rDhYGxek4sB3RR1ON2rHN2dp0GqMc+6igJg/mcYH0D9gbTyJvSCoG dXN6y3xgTHRDzvVpHoO4eEHoqExxVDRYoqhbL/nazppZz4IQwqac3qRh86yM1hxq0AbM 32eAnmzjz338JtvMSDocHu4I0yqb+T+zm6nQ1GoJ62nAAyJpqSwEyTTM0Etd/9u3B4qW w4XAJ+NemyaAZqfJ9NazSdALbZHmil9jmXSQKbqlHvNVYFMnaA6Xxc9cH3LaTgem3sm4 dO6THtCU3z2prz4RNllHsTXeKMtxahXldXKuFYTsIBaL+8V2NX7CVlNkH3Hw+ri1sx71 IYow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vbJtEH7l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l1si4589453ejo.68.2021.09.16.15.25.20; Thu, 16 Sep 2021 15:25:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vbJtEH7l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343695AbhIPQoD (ORCPT + 99 others); Thu, 16 Sep 2021 12:44:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:51056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243806AbhIPQjC (ORCPT ); Thu, 16 Sep 2021 12:39:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DDFA1613A7; Thu, 16 Sep 2021 16:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809374; bh=PL2fjtyQz7kstaeOcGoYXzrIajW5xStSDU0XM1YcDts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vbJtEH7l18VEZ/hzZCaSspq2lovWW7JQijShfk6Y45TD+8D9WZWcKw+upxe9wFMUq /1EYjzPIAL1v7PZVQ3UtXYYG0TIhuvHov1gtmPYEV8rCJSwPfRDU8uvDu3IGKGHywE DjXeZWbr315tIfMB1eaxmTz/pB7/CQYCh8OI+jH8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.13 131/380] f2fs: fix to account missing .skipped_gc_rwsem Date: Thu, 16 Sep 2021 17:58:08 +0200 Message-Id: <20210916155808.499147799@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@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: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit ad126ebddecbf696e0cf214ff56c7b170fa9f0f7 ] There is a missing place we forgot to account .skipped_gc_rwsem, fix it. Fixes: 6f8d4455060d ("f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/gc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 83b0a7872b3c..1c05e156d9d5 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1497,8 +1497,10 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, int err; if (S_ISREG(inode->i_mode)) { - if (!down_write_trylock(&fi->i_gc_rwsem[READ])) + if (!down_write_trylock(&fi->i_gc_rwsem[READ])) { + sbi->skipped_gc_rwsem++; continue; + } if (!down_write_trylock( &fi->i_gc_rwsem[WRITE])) { sbi->skipped_gc_rwsem++; -- 2.30.2