From patchwork Fri Aug 25 13:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13365814 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 55C75C71133 for ; Fri, 25 Aug 2023 14:02:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0DB52800CF; Fri, 25 Aug 2023 10:02:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBD57280053; Fri, 25 Aug 2023 10:02:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C670C2800CF; Fri, 25 Aug 2023 10:02:18 -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 B2BCE280053 for ; Fri, 25 Aug 2023 10:02:18 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7D353A05CF for ; Fri, 25 Aug 2023 14:02:18 +0000 (UTC) X-FDA: 81162791556.05.4D0DDF4 Received: from out-252.mta1.migadu.com (out-252.mta1.migadu.com [95.215.58.252]) by imf14.hostedemail.com (Postfix) with ESMTP id E578810003B for ; Fri, 25 Aug 2023 14:02:15 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=W3mJ9hHH; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692972136; 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=KWqxpxLv+BWdZ1zPLCWWiPjW3gW3QR8GdaNCgbqB+rA=; b=Plg2fwnCCvt9p7QHe9sUfMZ7bn6yXNbJqqb7zaUTpzR21pCMiZzkASwgv3axWBkaJDVY+o jB47i/g/gfM8XhrXF/+kllrjDg6Eps1J/ujoh8y3U3FRMt2Kfu4h8B0fi3xn/iqqIzmlPP 1lLa+loJ48HtaP/AhClr61NwDcCkF3o= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=W3mJ9hHH; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692972136; a=rsa-sha256; cv=none; b=0T8JA51FK2RO6idPWkteq2KVm+pYxXg4eOyCs9QwMhp3jVJidgGJjTt36G1IbrnPGYp5Uu K8JI/IK+RiuDU4WhekJA/7qjDCr8cPr732kUppVh9917z1Xk1yitmSTZ+qszLHS+OWMZs0 WGCeap9s09WpKH6VeZRtygjt6P+zl44= 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=1692972134; 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=KWqxpxLv+BWdZ1zPLCWWiPjW3gW3QR8GdaNCgbqB+rA=; b=W3mJ9hHH5VKigloC5U9bTjeZXL1WzXE+if57PbkgslJR/vwxXv7urAz03rnLzn8z8erL5h VCpx6iOsBDC23kpw8k8XGE0qr0cLxvBRgKj1NfrV6YtEtntJMub0qfyQ1aHr3mZsH0O0dL P836PFFsTuNux9i0jwQOVu5ehTDOpZM= 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 16/29] xfs: add nowait parameter for xfs_inode_item_init() Date: Fri, 25 Aug 2023 21:54:18 +0800 Message-Id: <20230825135431.1317785-17-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-Queue-Id: E578810003B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tiw31hy8w9wqba41fsbtowat4wkn91wf X-HE-Tag: 1692972135-996961 X-HE-Meta: U2FsdGVkX1//CfaId1jRUnnQsbxAtp2QDOjby0dOyfDQYYlYSmHJcRJDs5WcOITZ9vRq3FpN0lOOwAvseLNeeo8acIy1daWVrXzOYF6y+QdvyfjtJCx5XTDoJ1LNJQBFxgwkW1JKL2NjUtIvz6Zuvj8YfeVqLPvhC9tCn8cbPcQIFXBzzoytUhZSW0OknDExECcs3cduLiHsla4pfl5KL7K6fY/+dt4jBrPgyti/wQkRhfJUzhEg3Qv+mTpg2TwmvhWd6F/KIr3C2lHM37APn/XlGe/++R2YdRelki5MPEQln3LX0Ks7Jc5QJFrCYseb+zTdqZRBXwFloBSjHUc3QY2hLgkkncQ+NKoZMbD2tFTXOc0C5uFkcypDaGB0it7r06eazRalHbTS/ylSu98Els+WnibSjuHsUEUnB0TzejKi/DvlyhaH1AyAjDO/TLvNXWinElpcQt98Tw5KWtF21HXHxXZXFEzpnz2RO60NqB5u4gYDOjZnDuF7fSc3rVHTJyF28eljzJOUljS+mQKEhaD+iZrZ34wb8lmAmqZlffeY45CKcbpOftvGRW7BhwmhZRQmSGKnbKFoHd++KFs2kljEAEq+MPaTe19SxQN6nYwJwXZOGhqWTFGywZHKC9y+98gxMuVDK+g6Z7BfyU6xS9rtwc5/AwSsGPjSSuQ18slUIxeIK5DW3x4t7Vg3QOfZQ0as3dUOGepZmclZqhPf2hbcpdTURZrXdvGM/vO3Ga8aLqJEgVdL1zi5i5fsRnR698LaVyUmL51cc8+S5tZ0uVcM/WrNR92rC86LYNQviiK9pfH6WNw36ImDQbM+Rwp5KkYap1nH3Ugf4odv4TyZcD5OcpXuwa4C+2923EL+u8KP6wTKhhEUltV6SE/lSGCfzHlBTvXtuh9ne4sO+5Wrwj9D9fn4GnrKmikktFykZhHqcHBtECteOka5ohnAYj6EE+hX8Gzw9Myb8AQXmzU zlK8s1TU NP0DxLpsNI0iz5g6YVN6fbbaYtgdQHhEOUJ5DQdmjsLzZkWAsqNx43sETFTI2RoWNygYsDqhGpoZ3CzNjGboSKbB/sp2d0wTh3wuAoEFXG0hkb9aR3NuRrbqQW0aDb/3/xPx9NAFZMuVUQVPE3BNFiM66k8GMy5+U6zCK94cAO5TN1BeL4cARYSzV6ItcXK6UAHRXIXRtpPozSuRMEiTkRBmsXh3XwJEsh0olv9JMxgqetAMctGSmxPd/40VU41wncdDb 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 Add nowait parameter for xfs_inode_item_init() to support nowait semantics. Signed-off-by: Hao Xu --- fs/xfs/libxfs/xfs_trans_inode.c | 3 ++- fs/xfs/xfs_inode_item.c | 12 ++++++++---- fs/xfs/xfs_inode_item.h | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index cb4796b6e693..e7a8f63c8975 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c @@ -33,7 +33,8 @@ xfs_trans_ijoin( ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (ip->i_itemp == NULL) - xfs_inode_item_init(ip, ip->i_mount); + xfs_inode_item_init(ip, ip->i_mount, + tp->t_flags & XFS_TRANS_NOWAIT); iip = ip->i_itemp; ASSERT(iip->ili_lock_flags == 0); diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 91c847a84e10..1742920bb4ce 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -825,21 +825,25 @@ static const struct xfs_item_ops xfs_inode_item_ops = { /* * Initialize the inode log item for a newly allocated (in-core) inode. */ -void +int xfs_inode_item_init( struct xfs_inode *ip, - struct xfs_mount *mp) + struct xfs_mount *mp, + bool nowait) { struct xfs_inode_log_item *iip; + gfp_t gfp_flags = GFP_KERNEL | (nowait ? 0 : __GFP_NOFAIL); ASSERT(ip->i_itemp == NULL); - iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_cache, - GFP_KERNEL | __GFP_NOFAIL); + iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_cache, gfp_flags); + if (!iip) + return -EAGAIN; iip->ili_inode = ip; spin_lock_init(&iip->ili_lock); xfs_log_item_init(mp, &iip->ili_item, XFS_LI_INODE, &xfs_inode_item_ops); + return 0; } /* diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h index 377e06007804..7ba6f8a6b243 100644 --- a/fs/xfs/xfs_inode_item.h +++ b/fs/xfs/xfs_inode_item.h @@ -42,7 +42,8 @@ static inline int xfs_inode_clean(struct xfs_inode *ip) return !ip->i_itemp || !(ip->i_itemp->ili_fields & XFS_ILOG_ALL); } -extern void xfs_inode_item_init(struct xfs_inode *, struct xfs_mount *); +extern int xfs_inode_item_init(struct xfs_inode *ip, struct xfs_mount *mp, + bool nowait); extern void xfs_inode_item_destroy(struct xfs_inode *); extern void xfs_iflush_abort(struct xfs_inode *); extern void xfs_iflush_shutdown_abort(struct xfs_inode *);