From patchwork Fri Aug 25 13:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13365921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 869FDC79F60 for ; Fri, 25 Aug 2023 14:02:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24CDB2800D1; Fri, 25 Aug 2023 10:02:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FCFB2800D0; Fri, 25 Aug 2023 10:02:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0EC602800D1; Fri, 25 Aug 2023 10:02:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F0E9E2800D0 for ; Fri, 25 Aug 2023 10:02:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C1DAEB259B for ; Fri, 25 Aug 2023 14:02:43 +0000 (UTC) X-FDA: 81162792606.30.7CD5D16 Received: from out-248.mta1.migadu.com (out-248.mta1.migadu.com [95.215.58.248]) by imf21.hostedemail.com (Postfix) with ESMTP id 05C3E1C002D for ; Fri, 25 Aug 2023 14:02:41 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Eb4iAdgT; spf=pass (imf21.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.248 as permitted sender) smtp.mailfrom=hao.xu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692972162; a=rsa-sha256; cv=none; b=77yhf2W5ozMIWZ3o3J9Zq0qAfhkJXFWTgrrLBAfiM8D1+L3m9yI92UwvzDeiwQhGTB/AlS 2TSzMiFeKX8SJGtyXLAaAOSgLgUsqeRG6r9BuK/GtfF5MPNFUm4LbPODJ0k/FmbcJ6wuyc ZOp2aNBntYTTAo5YWLdkyyiApdLfJ4M= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Eb4iAdgT; spf=pass (imf21.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.248 as permitted sender) smtp.mailfrom=hao.xu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692972162; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3IHqyAGVDJ58osMbe/1AdWvJDmRup4/lFC37whRevKc=; b=aJB9O/WdQLzrUkNP49k8YxeBtLNxJ1ENtkcz9eW4JsKdhHLiEoAUAY92KqOzFrAFC9y7bP DNn8M7yktfEAQtiN/+B7/iHAdw4r1zU8qQisnmAQjUbGKipC1Er2X9Bxa8GdNVmJaCoPhc 4b4dHD8zPz9weQOouyFJnjboMVpR8j0= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1692972160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3IHqyAGVDJ58osMbe/1AdWvJDmRup4/lFC37whRevKc=; b=Eb4iAdgTR0TpdbPqUzDwHbHxPEh5V68LsiBX5YVrmluxRTdzMTEqMqKrZvLhm9MDpgg3K/ D2eTyYZZZ+bfvHLihjIIZJ2OKJ2cQ07lnUU3TLxQlV7ixmfK6NG3WLuhhK+cGvea8pFBoo CGGtOLVSVaB7g8RjjJfuG0O31ub2h9Y= From: Hao Xu To: io-uring@vger.kernel.org, Jens Axboe Cc: Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , Dave Chinner , "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cachefs@redhat.com, ecryptfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-unionfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-nilfs@vger.kernel.org, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mtd@lists.infradead.org, Wanpeng Li Subject: [PATCH 17/29] xfs: make xfs_trans_ijoin() error out -EAGAIN Date: Fri, 25 Aug 2023 21:54:19 +0800 Message-Id: <20230825135431.1317785-18-hao.xu@linux.dev> In-Reply-To: <20230825135431.1317785-1-hao.xu@linux.dev> References: <20230825135431.1317785-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 05C3E1C002D X-Stat-Signature: 3kn3hy8nzg3z5k6bd1ucmib6g8obefsn X-Rspam-User: X-HE-Tag: 1692972161-179699 X-HE-Meta: U2FsdGVkX18m5iAR39uuMb0yHoOrCw+ukxELbu/r0epjP9euzJVn59ODvbA0JUBRj4SYYPdWDl/gf8VRHMmquqP+KOCzJ3poWxU9HWFtK0Eb1NYl/zqpxLdoRoZ6qyxH56IMiX6OCNyj/NdaBc3t/ewEBTHsZaTMEHNn+DVDikMn+q+c6if4DSBXUTVCaCZqnjed9X104It6xvbVa0RPrnn5k73/AC7a1aTV957TMYXhb4dqsLtBuGCTwrkuT7wTK2aHUhUQOrzFjbdt4jLG7nLBBtiIWYyKlcl0XnYIOPDFwWBWmfadqlgD5jzhyYIb+J4v9IPftpFvuoc8qz4+vT2s6LLlU8DTSZsbA6M71f0QpfGtNIQmPyh7H54yBl3IUDCVhlRHh8qMZvxOnJG4mjUVN6n5o2CNyr6Pijf38eEq8qY3vV5OcOcmWJ9m5IpEa1tBZa+yQVMxWrHc+11Ed9taglHKlwIPFTs0oREOSj0Vya1x8NhZse0OTjBqaIMoCWKxbKmqPIbBpwDRDLQg3QHlyzBxIVWSo1wfq9ibez8uL+qRJJqYc4iL88NH5jR9PrUrQpH3ijU1aTKbFOO6Fc+UZPoS/Lt10awACXjzdV2pOtC5svQ92la0aoDSayKeht/bMe0phY1iDS8sA5kyyNZRE8/6GKvn0iphPs4QyAivH17k7+UQ6gPI3jsGFA+3jGentcKiV3/UZkGuf98AA+Zc8cTIg9zkJxmvDMM1+M+yF5nV3OWdB3d7qTrBlr+piPMIrjkkNxsnsNzVH3RARbLlMJFyJkdEv6B3lMpFdNlIJvk+FT9bS6FWhB33AbX7t6RUNgGNkFAzLjvHtcBKTe4QxZzLn1OEydVhlnVglvtmXNWjhSZxqot2xSK7UYGwpfMETC8L1g3qwA7zRX64OtLn0IsiGiUtg/lK/+RzZTUyC+Q4CffDxxHpx9gNNGOUdS3Sivx6LCMUDCynF98 Uz1KXyMY M9GSde/sbzMtuVU3x0Om4eZ3vTw1JCBHeaNIsbUEQCMa8BN9S/LxdaNBPGGbol+PNJOcN9oKPZLak7bKKaTX2ivMjOc5wOZUt0cTLv3S7jHDTJ4UsXfBIR/4CfJ8T2lAA5yJ1gfToEXm+d2LhhBxmEDT5GClqk2Aas4eNsYTddD1ke+8KpQkporWJ5TiyXiOb6C0TPsdZPQks2mMgmpf1mNmXu1p0WsmZImF2YuqdpAxVmkQFXedip7sBbBi8BXH2qXUr X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Hao Xu Change return value of xfs_trans_ijoin() to error out -EAGAIN. Signed-off-by: Hao Xu --- fs/xfs/libxfs/xfs_trans_inode.c | 13 +++++++++---- fs/xfs/xfs_iops.c | 4 +++- fs/xfs/xfs_trans.h | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index e7a8f63c8975..7bda62bad90a 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c @@ -23,7 +23,7 @@ * The inode must be locked, and it cannot be associated with any transaction. * If lock_flags is non-zero the inode will be unlocked on transaction commit. */ -void +int xfs_trans_ijoin( struct xfs_trans *tp, struct xfs_inode *ip, @@ -32,9 +32,12 @@ xfs_trans_ijoin( struct xfs_inode_log_item *iip; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - if (ip->i_itemp == NULL) - xfs_inode_item_init(ip, ip->i_mount, - tp->t_flags & XFS_TRANS_NOWAIT); + if (ip->i_itemp == NULL) { + int ret = xfs_inode_item_init(ip, ip->i_mount, + tp->t_flags & XFS_TRANS_NOWAIT); + if (ret == -EAGAIN) + return ret; + } iip = ip->i_itemp; ASSERT(iip->ili_lock_flags == 0); @@ -44,6 +47,8 @@ xfs_trans_ijoin( /* Reset the per-tx dirty context and add the item to the tx. */ iip->ili_dirty_flags = 0; xfs_trans_add_item(tp, &iip->ili_item); + + return 0; } /* diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 47b4fd5f8f5c..034a8fea1f8e 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1075,7 +1075,9 @@ xfs_vn_update_time( if (flags & S_ATIME) inode->i_atime = *now; - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); + error = xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); + if (error) + goto out; xfs_trans_log_inode(tp, ip, log_flags); error = xfs_trans_commit(tp); diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 6e3646d524ce..f2c05884c4b6 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h @@ -226,7 +226,7 @@ bool xfs_trans_ordered_buf(xfs_trans_t *, struct xfs_buf *); void xfs_trans_dquot_buf(xfs_trans_t *, struct xfs_buf *, uint); void xfs_trans_inode_alloc_buf(xfs_trans_t *, struct xfs_buf *); void xfs_trans_ichgtime(struct xfs_trans *, struct xfs_inode *, int); -void xfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint); +int xfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint); void xfs_trans_log_buf(struct xfs_trans *, struct xfs_buf *, uint, uint); void xfs_trans_dirty_buf(struct xfs_trans *, struct xfs_buf *);