Received: by 2002:ab2:620c:0:b0:1ef:ffd0:ce49 with SMTP id o12csp1436973lqt; Wed, 20 Mar 2024 04:13:34 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX947RhGdsAGxTD3y/MiJenunsaKNFyqxTArXIH/2+vTM9MoO4TMAcFu3mna+4Bc2A0YQHNqucn7UuuXTsIvbMs2Sirv8M3CHD0SQHf1g== X-Google-Smtp-Source: AGHT+IEjJdvyPIaVgzqVkb0dDbbfxsmR37UcRTIhHFVqX11TZs5kiwzusEgLTuAOu/7uxsLioicq X-Received: by 2002:a05:622a:138f:b0:431:156:b0a0 with SMTP id o15-20020a05622a138f00b004310156b0a0mr1746149qtk.23.1710933214636; Wed, 20 Mar 2024 04:13:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710933214; cv=pass; d=google.com; s=arc-20160816; b=NAfH3hFeuedYtn9gWkgsmm8xA83dwCOcRgSgkGnI8JO1r6jtSTn3Bv9cJ8rxLNXSPx 1+1G2YBzy68cVVqClpYxxDXxSCauKZAfop9mi+LzpCZDT86SLnMYWt0RR1x2sNXQ+7Zr mX1LIVQ9g9aQnoOSQ2tRRtzF7TRZ+zXMJJQJrz/qSrRQfBY3fVcttIBFNpo9wfrRd90+ Z4cBw+sTUfJI6fEVWcH5eY+SrLa6nRp3u5LOW79G/S4cXZu0jIHJ4KXXj/go9h2LgX1n v7r6YkJLXmWyVkdK9j7ycmDVINhsxo/7qLU5a6KsHpf1K5FA8TXidtNgtuXuWWckGpdT lVAg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=ro0b+T0c9JJT8o6+vnDWLEcQauHHImNSDyQc+9pT+xg=; fh=5dB93T9RUScPXiJBPgMY9ddAKXpKWIKqxrLOkZR5g5k=; b=nR/jnftbyE3diZzTkYthE9eFbBnQdTngArr+hmt0+GDOtcTFQDOmabfbAjVzm5k72H SxoNTJG06TXENaZhWQkZlHgmv+JiNOow/yVEQDcZwEjBneNuV7QBRMAqhFkj2dsLeVXm Z+ikEv/yDMZgwNSEhGNULQkgkf01uGOBJs7YpR72DYCCfIWeu9AKYAzjFbqg2BPfuufR fr8BbZH8RkAm1aq+gYRSYsc5hnloCHel07Po7ls9ahaYCYSTP9mQRJH2uwOmMJ3ORIfl 3GkhntUWYIzbVOZisLUUO1w0kapUg1yvZnF6cUz9F/o96nrIv4NEsEaA2AJ2YgjG3KK1 3SSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-108826-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-108826-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t19-20020ac85893000000b0042f4b70543asi6254289qta.60.2024.03.20.04.13.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 04:13:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-108826-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-108826-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-108826-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 5C1D11C22836 for ; Wed, 20 Mar 2024 11:13:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1B153DBA8; Wed, 20 Mar 2024 11:13:14 +0000 (UTC) Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 679813B293; Wed, 20 Mar 2024 11:13:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710933194; cv=none; b=e8appUPAgahWKRgYmZeeZi7bcvHbD/5rSNDlnUwvTmCbPki2M65Y+GBDzV4ejvfMRRqrcSo6aI0Z5Jxg1/8peKLxHmqQlfjUpfCGAyoUiR3SmyBht808t2ed5ZQb8MdBnovN3RJ+sGhR6eI7uiL+VJSCed3arQb/5mhuF9LX0Co= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710933194; c=relaxed/simple; bh=pRbunPy/IIVijkRZ4ITKdlLr/Xnvmah8LKTQThvQx1U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HkcY/j1qwA4MeMFhRktmDVXXFTcvmI3mCG7PVDaMjRbXPBEPM9GTicffSeSJYPUVg3OZxrbyR3EgDe/BClaHeTeeVlwq/wpsQDGpe4E0aPwWNkIum58EnIpIIFrWRxV7g4PvrE5H64OBO4mPqJJZvew8WAzdDXEUuPbYVxC/hkA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4V05Y92WLvz4f3n6V; Wed, 20 Mar 2024 19:13:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 4533B1A0199; Wed, 20 Mar 2024 19:13:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgBXKBG5xPplGX0fHg--.18516S6; Wed, 20 Mar 2024 19:13:09 +0800 (CST) From: Zhang Yi To: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, djwong@kernel.org, hch@infradead.org, brauner@kernel.org, david@fromorbit.com, tytso@mit.edu, jack@suse.cz, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, chengzhihao1@huawei.com, yukuai3@huawei.com Subject: [PATCH v4 2/9] xfs: make the seq argument to xfs_bmapi_convert_delalloc() optional Date: Wed, 20 Mar 2024 19:05:41 +0800 Message-Id: <20240320110548.2200662-3-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320110548.2200662-1-yi.zhang@huaweicloud.com> References: <20240320110548.2200662-1-yi.zhang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgBXKBG5xPplGX0fHg--.18516S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww45uFy8Ww43JF43JryrJFb_yoW8JF43pF s7Ga4UWFZ3Xw4avF4kJF15Wan3t3Z2ka40yFs7Zwn3ZanrJw4aqr1rKFyYqw1UA3yFqF18 WF13Cr17Xw45AFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUlZXOUUUUU = X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ From: Zhang Yi Allow callers to pass a NULLL seq argument if they don't care about the fork sequence number. Signed-off-by: Zhang Yi Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index f362345467fa..07dc35de8ce5 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4574,7 +4574,8 @@ xfs_bmapi_convert_delalloc( if (!isnullstartblock(bma.got.br_startblock)) { xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags, xfs_iomap_inode_sequence(ip, flags)); - *seq = READ_ONCE(ifp->if_seq); + if (seq) + *seq = READ_ONCE(ifp->if_seq); goto out_trans_cancel; } @@ -4623,7 +4624,8 @@ xfs_bmapi_convert_delalloc( ASSERT(!isnullstartblock(bma.got.br_startblock)); xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags, xfs_iomap_inode_sequence(ip, flags)); - *seq = READ_ONCE(ifp->if_seq); + if (seq) + *seq = READ_ONCE(ifp->if_seq); if (whichfork == XFS_COW_FORK) xfs_refcount_alloc_cow_extent(tp, bma.blkno, bma.length); -- 2.39.2