From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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=unavailable 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 9A5E9C433EC for ; Mon, 22 Mar 2021 12:31:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 773CD619A0 for ; Mon, 22 Mar 2021 12:31:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230494AbhCVMam (ORCPT ); Mon, 22 Mar 2021 08:30:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:52482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbhCVMaC (ORCPT ); Mon, 22 Mar 2021 08:30:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B00B6198D; Mon, 22 Mar 2021 12:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416201; bh=1ZlYgbyX380SR7QuyvLk98g81AJFWAdBEg3n63V3xE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xl1T+HQmnsyno4yTiM11HRH4EO85WEusWoqzL4tWvOnXnpogMLvuZoGH2iDmWu1yO H9mRp05/lMfUT5Q3yeDto+uHbHNPyADZF79m6itWmk5uCdLfnZcWQhJpDYqkxWB4Qg QQa62QYL9qCFHHzvO3MwhyCqPF8nrQ1jiAFTwYQ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Damien Le Moal Subject: [PATCH 5.11 018/120] zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone() Date: Mon, 22 Mar 2021 13:26:41 +0100 Message-Id: <20210322121930.277962148@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121929.669628946@linuxfoundation.org> References: <20210322121929.669628946@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 commit 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 upstream. In zonefs_open_zone(), if opened zone count is larger than .s_max_open_zones threshold, we missed to recover .i_wr_refcnt, fix this. Fixes: b5c00e975779 ("zonefs: open/close zone on file open/close") Cc: Signed-off-by: Chao Yu Signed-off-by: Damien Le Moal Signed-off-by: Greg Kroah-Hartman --- fs/zonefs/super.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -1032,9 +1032,7 @@ static int zonefs_open_zone(struct inode mutex_lock(&zi->i_truncate_mutex); - zi->i_wr_refcnt++; - if (zi->i_wr_refcnt == 1) { - + if (!zi->i_wr_refcnt) { if (atomic_inc_return(&sbi->s_open_zones) > sbi->s_max_open_zones) { atomic_dec(&sbi->s_open_zones); ret = -EBUSY; @@ -1044,7 +1042,6 @@ static int zonefs_open_zone(struct inode if (i_size_read(inode) < zi->i_max_size) { ret = zonefs_zone_mgmt(inode, REQ_OP_ZONE_OPEN); if (ret) { - zi->i_wr_refcnt--; atomic_dec(&sbi->s_open_zones); goto unlock; } @@ -1052,6 +1049,8 @@ static int zonefs_open_zone(struct inode } } + zi->i_wr_refcnt++; + unlock: mutex_unlock(&zi->i_truncate_mutex);