From nobody Mon Sep 28 06:34:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E25F433B97B; Tue, 25 Aug 2026 16:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673899; cv=none; b=hKx3LIzVeQMyNvLds6Tmc3g4fQGm/1pAnMqMZyALNQIMHUAm6mHT0d4RSgE0ZnQAXCVVfR585BLkPVYNkALXMaDtREOdUDjjfJv3BPzZWUEing9WvDN1k8CVl0E81h0N31tn+EmHEfIZB/yJYk/Ykt1Gglp30rBFFMOrERDtUVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673899; c=relaxed/simple; bh=2+jFO/P3BGcWQvUFK4ldginqeIuydNFf7qjazms8PEo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AuW0AGuAKqnn7YsmvXF3Iw3Zkkl5tGEgu8/UGHM6NoR+qtGsIyhRQCkPrSHbvmrlFKsAC1Ui9jXKLoeCHeDoBAFzHUQS39L3/A7yFC1rD8ANXJfWLs9FbigsIi4K1yibKw6I6UCiXqgt1hufguKJQLppUumUsBvqyCPJgQKtjRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ePKUg6/A; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ePKUg6/A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A3001F00A3D; Tue, 25 Aug 2026 16:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787673897; bh=3mntvJAHhytu5viFQowYsbS7QVsCCWaixajcjCeZSQw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ePKUg6/APGCFmXCpoGy72o/ErmD0SH8XyliuRmlaRVZ6piO4Xz54L04rev0E7MzFh KMQwG6ZgoWaSnSHv90/xbF8rvxdh5p8tRXd5FRIksVtEoi346S8ifde9E6skQG/FZz FlkoUAPP/4aCnBb8t+PezsNk7rpL1cQJoG9blTps8gNpVZVkUWtvWYPOXui3pMSAD0 I3XndnJklNFSCX2sErQwF8jE1Yjr1lKkWlmgskyIThLxyKqGY3QX91XOuxSKp/XbR9 Fkvb5Pc8Bz7L1kU8pMlYFYvz9LyOaDCtL7Qrw+Gu7TkeF13FiauaonprXN2UcujzAo 3PzzZIWSkHEpw== From: Jeff Layton Date: Tue, 25 Aug 2026 12:04:17 -0400 Subject: [PATCH v4 1/4] btrfs: split btrfs_insert_delayed_dir_index() into prealloc and commit phases Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-btrfs-enomem-v4-1-b9363fa8714a@kernel.org> References: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> In-Reply-To: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> To: Chris Mason , David Sterba Cc: Qu Wenruo , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9478; i=jlayton@kernel.org; h=from:subject:message-id; bh=2+jFO/P3BGcWQvUFK4ldginqeIuydNFf7qjazms8PEo=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqjb0n7nNMqp9kQBxVhe/4LQp7Cmk01ny/ons1l jNybCq3APyJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCao29JwAKCRAADmhBGVaC Fb4+EACRATjRSXmGLABGFbyLMS/zJQv2Vn2Ju6nXBHFtrKkIvwG3TEcavZ14sg2SK40KeQ2sXI/ PNjaKpiexrTmQXJn4yib8tm8SXenG80VsFz7cKztvkMA42MTXN/YoZWgHLXxbfzpkEuXRVqOyoU ygd7VtCDR0cfHdTSMdp7HmhAFZXu7OeVIFZzpj1NVa32kLLJCkIna2Evb5bLsJEBmhF3cHkD3UC nWj6YLyo+eOWAL24RG+qbqfhzwNqXoOXPHEoWUkmnU2QrOf3QiSGNVVGnusg4irw73dtD76c8io rdDbE828BAmykM70iF20tnIDLivpqNyDIxtEoV9iPo0B811QH0SfFQ3QHqRJtG/O8jeufiqH/Wi GRTlFSniZBi9uyjR9SGzWwRXp9I2DQIQ2V7BLGEm0Xbd/kiJRXP2RaJB5oMQyXFM+JS7VmiREXY +hDYqcXw+7CfroZ7oeJpzlUXKb73keGc0JYdhBTI7AeYKFnLB2eVQktsB8Lp65XWXalXrEwS387 XvpYE5//WltUQJtPo3/0WgZmJADjz+3wNz/8bNLDvOeo4QippqyF1EEFvDbPT9qukPl4wTpeOu2 7qpTQ2Fasm+qog6viQjKKVhjjSvOfonmDBcxa6RVzzjDs+m1qNDecY/a5zqsDJtatP3PwaNbQLc uK3CMadgYJMoDoQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Split btrfs_insert_delayed_dir_index() into three functions using a new btrfs_dir_index_prealloc struct to bundle the pre-allocated resources: - btrfs_prealloc_delayed_dir_index(): allocates the struct and performs the two GFP_NOFS allocations (delayed node + delayed item) that can fail with -ENOMEM. Returns the struct, or ERR_PTR on failure. - btrfs_insert_delayed_dir_index_prealloc(): populates the item data, inserts into the rb-tree, and reserves metadata space. Cannot fail with -ENOMEM since all allocations were done in the prealloc step. - btrfs_free_delayed_dir_index_prealloc(): frees pre-allocated resources when the caller's btree insertion fails. Tolerates NULL. The prealloc is returned as a pointer rather than filled into a caller-provided struct, so that a plain NULL means "no prealloc" and callers do not need a separate flag to track whether one exists. It is consumed (and freed) by either the commit or the free helper, so ownership is unambiguous. The original btrfs_insert_delayed_dir_index() is refactored into a thin wrapper that calls the prealloc and commit functions. This split allows callers to move the fallible memory allocations before the point of no return (the DIR_ITEM btree insertion), so that -ENOMEM can be returned cleanly without aborting the transaction. Assisted-by: LLM Reviewed-by: Qu Wenruo Signed-off-by: Jeff Layton --- fs/btrfs/delayed-inode.c | 128 ++++++++++++++++++++++++++++++++++++++-----= ---- fs/btrfs/delayed-inode.h | 17 +++++++ 2 files changed, 121 insertions(+), 24 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index db2ffab0941a..af5e6dbf60d3 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -6,6 +6,7 @@ =20 #include #include +#include #include "ctree.h" #include "fs.h" #include "messages.h" @@ -1469,35 +1470,93 @@ static void btrfs_release_dir_index_item_space(stru= ct btrfs_trans_handle *trans) trans->bytes_reserved -=3D bytes; } =20 -/* Will return 0, -ENOMEM or -EEXIST (index number collision, unexpected).= */ -int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, - const char *name, int name_len, - struct btrfs_inode *dir, - const struct btrfs_disk_key *disk_key, u8 flags, - u64 index) +/* + * Pre-allocate a delayed node and delayed item for a dir index insertion = and + * copy the name into the item. Call this before modifying the btree so th= at + * ENOMEM can be returned before any on-disk state has changed. + * + * The returned prealloc is consumed by either + * btrfs_insert_delayed_dir_index_prealloc() or + * btrfs_free_delayed_dir_index_prealloc(); it must not be used afterwards. + * + * Returns a prealloc on success, ERR_PTR on allocation failure. + */ +struct btrfs_dir_index_prealloc *btrfs_prealloc_delayed_dir_index(struct b= trfs_inode *dir, + const char *name, + int name_len) +{ + struct btrfs_dir_index_prealloc *prealloc; + struct btrfs_delayed_node *node; + struct btrfs_delayed_item *item; + + prealloc =3D kzalloc_obj(*prealloc, GFP_NOFS); + if (!prealloc) + return ERR_PTR(-ENOMEM); + + node =3D btrfs_get_or_create_delayed_node(dir, &prealloc->tracker); + if (IS_ERR(node)) { + kfree(prealloc); + return ERR_CAST(node); + } + + item =3D btrfs_alloc_delayed_item(sizeof(struct btrfs_dir_item) + name_le= n, + node, BTRFS_DELAYED_INSERTION_ITEM); + if (!item) { + btrfs_release_delayed_node(node, &prealloc->tracker); + kfree(prealloc); + return ERR_PTR(-ENOMEM); + } + + memcpy(item->data + sizeof(struct btrfs_dir_item), name, name_len); + + prealloc->node =3D node; + prealloc->item =3D item; + return prealloc; +} +ALLOW_ERROR_INJECTION(btrfs_prealloc_delayed_dir_index, ERRNO); + +/* + * Free resources from btrfs_prealloc_delayed_dir_index() when the btree + * insertion failed and we will not commit the delayed dir index. Does not= hing + * if @prealloc is NULL. + */ +void btrfs_free_delayed_dir_index_prealloc(struct btrfs_trans_handle *tran= s, + struct btrfs_dir_index_prealloc *prealloc) { + if (!prealloc) + return; + + btrfs_release_delayed_item(prealloc->item); + btrfs_release_dir_index_item_space(trans); + btrfs_release_delayed_node(prealloc->node, &prealloc->tracker); + kfree(prealloc); +} + +/* + * Commit a pre-allocated delayed dir index item. @prealloc must have been + * returned by btrfs_prealloc_delayed_dir_index(). This populates the item, + * adds it to the delayed node's rb-tree, and reserves metadata space. It + * cannot fail with ENOMEM. @prealloc is freed here in all cases. + * + * Will return 0 or -EEXIST (index number collision, unexpected). + */ +int btrfs_insert_delayed_dir_index_prealloc(struct btrfs_trans_handle *tra= ns, + struct btrfs_inode *dir, + struct btrfs_dir_index_prealloc *prealloc, + const struct btrfs_disk_key *disk_key, + u8 flags, u64 index) +{ + struct btrfs_delayed_node *delayed_node =3D prealloc->node; + struct btrfs_ref_tracker *tracker =3D &prealloc->tracker; + struct btrfs_delayed_item *delayed_item =3D prealloc->item; struct btrfs_fs_info *fs_info =3D trans->fs_info; const unsigned int leaf_data_size =3D BTRFS_LEAF_DATA_SIZE(fs_info); - struct btrfs_delayed_node *delayed_node; - struct btrfs_ref_tracker delayed_node_tracker; - struct btrfs_delayed_item *delayed_item; + const int name_len =3D delayed_item->data_len - sizeof(struct btrfs_dir_i= tem); struct btrfs_dir_item *dir_item; bool reserve_leaf_space; u32 data_len; int ret; =20 - delayed_node =3D btrfs_get_or_create_delayed_node(dir, &delayed_node_trac= ker); - if (IS_ERR(delayed_node)) - return PTR_ERR(delayed_node); - - delayed_item =3D btrfs_alloc_delayed_item(sizeof(*dir_item) + name_len, - delayed_node, - BTRFS_DELAYED_INSERTION_ITEM); - if (!delayed_item) { - ret =3D -ENOMEM; - goto release_node; - } - delayed_item->index =3D index; =20 dir_item =3D (struct btrfs_dir_item *)delayed_item->data; @@ -1506,7 +1565,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans= _handle *trans, btrfs_set_stack_dir_data_len(dir_item, 0); btrfs_set_stack_dir_name_len(dir_item, name_len); btrfs_set_stack_dir_flags(dir_item, flags); - memcpy((char *)(dir_item + 1), name, name_len); + /* Name was already copied by btrfs_prealloc_delayed_dir_index(). */ =20 data_len =3D delayed_item->data_len + sizeof(struct btrfs_item); =20 @@ -1524,7 +1583,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans= _handle *trans, if (unlikely(ret)) { btrfs_err(trans->fs_info, "error adding delayed dir index item, name: %.*s, index: %llu, root: %llu,= dir: %llu, dir->index_cnt: %llu, delayed_node->index_cnt: %llu, error: %pe= ", - name_len, name, index, btrfs_root_id(delayed_node->root), + name_len, + (const char *)(dir_item + 1), + index, btrfs_root_id(delayed_node->root), delayed_node->inode_id, dir->index_cnt, delayed_node->index_cnt, ERR_PTR(ret)); btrfs_release_delayed_item(delayed_item); @@ -1562,10 +1623,29 @@ int btrfs_insert_delayed_dir_index(struct btrfs_tra= ns_handle *trans, mutex_unlock(&delayed_node->mutex); =20 release_node: - btrfs_release_delayed_node(delayed_node, &delayed_node_tracker); + /* Must release the node before freeing @tracker's containing struct. */ + btrfs_release_delayed_node(delayed_node, tracker); + kfree(prealloc); return ret; } =20 +/* Will return 0, -ENOMEM or -EEXIST (index number collision, unexpected).= */ +int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, + const char *name, int name_len, + struct btrfs_inode *dir, + const struct btrfs_disk_key *disk_key, u8 flags, + u64 index) +{ + struct btrfs_dir_index_prealloc *prealloc; + + prealloc =3D btrfs_prealloc_delayed_dir_index(dir, name, name_len); + if (IS_ERR(prealloc)) + return PTR_ERR(prealloc); + + return btrfs_insert_delayed_dir_index_prealloc(trans, dir, prealloc, + disk_key, flags, index); +} + static bool btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node = *node, u64 index) { diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index fc752863f89b..6d12a145489f 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -121,6 +121,23 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_= handle *trans, const struct btrfs_disk_key *disk_key, u8 flags, u64 index); =20 +struct btrfs_dir_index_prealloc { + struct btrfs_delayed_node *node; + struct btrfs_ref_tracker tracker; + struct btrfs_delayed_item *item; +}; + +struct btrfs_dir_index_prealloc *btrfs_prealloc_delayed_dir_index(struct b= trfs_inode *dir, + const char *name, + int name_len); +void btrfs_free_delayed_dir_index_prealloc(struct btrfs_trans_handle *tran= s, + struct btrfs_dir_index_prealloc *prealloc); +int btrfs_insert_delayed_dir_index_prealloc(struct btrfs_trans_handle *tra= ns, + struct btrfs_inode *dir, + struct btrfs_dir_index_prealloc *prealloc, + const struct btrfs_disk_key *disk_key, + u8 flags, u64 index); + int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, struct btrfs_inode *dir, u64 index); =20 --=20 2.55.0 From nobody Mon Sep 28 06:34:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EE3F633CEB0; Tue, 25 Aug 2026 16:04:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673900; cv=none; b=TzmWzZoiaOI1ZI99LWV576RnKOmECx0oqOM5E68RLdaRPpMa3JvHu3WkjHGDa9wHSm4vU/Rq44VWG0kle8+tRblSbYBcIwYNJRQrFY6NhgnBz0ZRWX31jNhQS7BV0uQjbZNGTAgzLec3UVFi0I8rIL8so398fqY3tQJqez9nUWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673900; c=relaxed/simple; bh=SuoQyOL5OoixGIQjHqn4nzB0MprTrfikfwtDwZ15904=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SG5BYFddRAX5XSI99aamjRIJrFRHoddgz7B0AcCPMvPnQ+H8ObcPPd6pNH4n4gADUDjZB6p18HsOney/3AoArDWODFhlmfuzMHwSLxYPQpSDV4aGTrPJqBlvOw0yLKXzt3Be4mMxlauiuhMMCRrXHVi0HkVHzLo/qPTnVO/H4aU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MwuDGG4j; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MwuDGG4j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E70A1F00A3A; Tue, 25 Aug 2026 16:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787673898; bh=b9PWBl+4Ny6MgSuhtKT5CkWx640e44bnpWLCqG0SP9A=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=MwuDGG4jGVH6ACG3IHHxQRWlN7G2Voso7nTg62FOIgq3YSxdd5pEBVKVSNJzL5GoU Mqc0W+psesnTPUA7bAWQm0rnQVdLZKQ6tKbRqRMHBBp8iQ+4nBX2YtW8NuOWsgYLRp lGG627xKSpSb5SYElHgSu8VHKtHTz8FO8/C02+XVMMEFtNRN3o8Sh5+3URM7BQg0HF LO0KwD9EkeBGTYJ0TGtO7oCg3H2OE5E26GjW4FZ4OSJEpHtY4yfLT7YbnrCDBYUo4h G8ZQGGeVEGLklCRKPZzTmZJBS6D32fhKl+dKk3qnr1K6ayiT70I3fZjIJOSmBsG4Zu IVZfg1G4/LQ0A== From: Jeff Layton Date: Tue, 25 Aug 2026 12:04:18 -0400 Subject: [PATCH v4 2/4] btrfs: pre-allocate delayed dir index before btree modification Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-btrfs-enomem-v4-2-b9363fa8714a@kernel.org> References: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> In-Reply-To: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> To: Chris Mason , David Sterba Cc: Qu Wenruo , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8619; i=jlayton@kernel.org; h=from:subject:message-id; bh=SuoQyOL5OoixGIQjHqn4nzB0MprTrfikfwtDwZ15904=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqjb0nWIZFZuz1fGM6yNp56J5XaPpV/Mxc5ekvA iLHI7Vq77aJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCao29JwAKCRAADmhBGVaC FWehEACyzonSjGx1EWycW1jXMdOktgWrVmKn6gimBomyBvWR9H+qYmOuM5jcXBUV5tW1n7jwam7 SpO+zBvhTt2dzz8Dq0to80ap3gvs7at/tAUnwQtyrnmHzKurhJTCFMv+noPj5Z/PYz68az++x2c arRWghe2H5yzQJdNcFXkePZTgbDaqnpvBgPOr8oDVnZiSa++18S2vILruR9MuP/up5FEtAesxrx 3fNp+88Y867rpkUHC7CVRqZeLwxfM1NLTL19esgQvMT2nEDIvuE0xkCm+kRJ0rcSeaY7c300cxy 21SQgfgBFyuvlSaTtYaObjyIgtVMLJZA8oJ1s8XPbuquIh1gX/bpvOd3i9n7uBjbhURp6wMnZQj 9xzPbCxc79dYLYRqZQZ5SF3Mc7s9chsfPvlfzetQrQVo090PjRBYRqnInn5IjAJZnFG1W9gabjp oxltJ7ubaPHdTp3CHbdWyER0IW1esYZCH1HmI79i7HvmllYIAcoDo4J6AgcqR0inqEL8TMlEAP6 sdnVT+bRla5/AbbE8GoJa03jE3cntEBorSV5/wCgWu6Fs3kykAqFpcW4nha7ymrt1EElNysUlaa UptNbclFDwakXAOzQloAPEg0ZKf96MpfjDaeDWn2dnEOEVSLFwPsx2eX44dHXnXAOVtBicfIVQs eNwyXP3jJpmBPlQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Move the delayed dir index allocation in btrfs_insert_dir_item() before the insert_with_overflow() call that modifies the btree. Previously, the allocations happened after the DIR_ITEM was already inserted, meaning an ENOMEM failure left the btree in a partially-modified state that could only be resolved by aborting the transaction. Add an optional caller-provided btrfs_dir_index_prealloc parameter to btrfs_insert_dir_item(). When non-NULL, ownership of the prealloc transfers to btrfs_insert_dir_item(). When NULL, it allocates internally. All existing callers pass NULL to preserve the current behavior. Since ownership transfers, btrfs_insert_dir_item() must free the prealloc on every path that does not commit it. Route all such exits (including the early path allocation failure) through a common out_free_prealloc label, rather than keying cleanup on need_delayed_index. Remove the btrfs_insert_delayed_dir_index() wrapper, as there are no more callers. Assisted-by: LLM Suggested-by: Qu Wenruo Signed-off-by: Jeff Layton --- fs/btrfs/delayed-inode.c | 21 ++------------------- fs/btrfs/delayed-inode.h | 5 ----- fs/btrfs/dir-item.c | 42 ++++++++++++++++++++++++++++-------------- fs/btrfs/dir-item.h | 5 +++-- fs/btrfs/inode.c | 2 +- fs/btrfs/transaction.c | 2 +- 6 files changed, 35 insertions(+), 42 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index af5e6dbf60d3..bd603525c133 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -687,7 +687,7 @@ static int btrfs_insert_delayed_item(struct btrfs_trans= _handle *trans, /* * For delayed items to insert, we track reserved metadata bytes based * on the number of leaves that we will use. - * See btrfs_insert_delayed_dir_index() and + * See btrfs_insert_delayed_dir_index_prealloc() and * btrfs_delayed_item_reserve_metadata()). */ ASSERT(first_item->bytes_reserved =3D=3D 0); @@ -1629,23 +1629,6 @@ int btrfs_insert_delayed_dir_index_prealloc(struct b= trfs_trans_handle *trans, return ret; } =20 -/* Will return 0, -ENOMEM or -EEXIST (index number collision, unexpected).= */ -int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, - const char *name, int name_len, - struct btrfs_inode *dir, - const struct btrfs_disk_key *disk_key, u8 flags, - u64 index) -{ - struct btrfs_dir_index_prealloc *prealloc; - - prealloc =3D btrfs_prealloc_delayed_dir_index(dir, name, name_len); - if (IS_ERR(prealloc)) - return PTR_ERR(prealloc); - - return btrfs_insert_delayed_dir_index_prealloc(trans, dir, prealloc, - disk_key, flags, index); -} - static bool btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node = *node, u64 index) { @@ -1661,7 +1644,7 @@ static bool btrfs_delete_delayed_insertion_item(struc= t btrfs_delayed_node *node, /* * For delayed items to insert, we track reserved metadata bytes based * on the number of leaves that we will use. - * See btrfs_insert_delayed_dir_index() and + * See btrfs_insert_delayed_dir_index_prealloc() and * btrfs_delayed_item_reserve_metadata()). */ ASSERT(item->bytes_reserved =3D=3D 0); diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index 6d12a145489f..57ba96cfaf9c 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -115,11 +115,6 @@ struct btrfs_delayed_item { }; =20 void btrfs_init_delayed_root(struct btrfs_delayed_root *delayed_root); -int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, - const char *name, int name_len, - struct btrfs_inode *dir, - const struct btrfs_disk_key *disk_key, u8 flags, - u64 index); =20 struct btrfs_dir_index_prealloc { struct btrfs_delayed_node *node; diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 84f1c64423d3..30ddafaf8d3d 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -106,8 +106,11 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle = *trans, * Will return 0 or -ENOMEM */ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, - const struct fscrypt_str *name, struct btrfs_inode *dir, - const struct btrfs_key *location, u8 type, u64 index) + const struct fscrypt_str *name, + struct btrfs_inode *dir, + const struct btrfs_key *location, u8 type, + u64 index, + struct btrfs_dir_index_prealloc *prealloc) { int ret =3D 0; int ret2 =3D 0; @@ -119,17 +122,28 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *= trans, struct btrfs_key key; struct btrfs_disk_key disk_key; u32 data_size; + const bool need_delayed_index =3D (root !=3D root->fs_info->tree_root); =20 key.objectid =3D btrfs_ino(dir); key.type =3D BTRFS_DIR_ITEM_KEY; key.offset =3D btrfs_name_hash(name->name, name->len); =20 path =3D btrfs_alloc_path(); - if (!path) - return -ENOMEM; + if (!path) { + ret =3D -ENOMEM; + goto out_free_prealloc; + } =20 btrfs_cpu_key_to_disk(&disk_key, location); =20 + /* Pre-allocate the delayed dir index before modifying the btree. */ + if (need_delayed_index && !prealloc) { + prealloc =3D btrfs_prealloc_delayed_dir_index(dir, name->name, + name->len); + if (IS_ERR(prealloc)) + return PTR_ERR(prealloc); + } + data_size =3D sizeof(*dir_item) + name->len; dir_item =3D insert_with_overflow(trans, root, path, &key, data_size, name->name, name->len); @@ -137,7 +151,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *tr= ans, ret =3D PTR_ERR(dir_item); if (ret =3D=3D -EEXIST) goto second_insert; - goto out_free; + goto out_free_prealloc; } =20 if (IS_ENCRYPTED(&dir->vfs_inode)) @@ -154,21 +168,21 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *= trans, write_extent_buffer(leaf, name->name, name_ptr, name->len); =20 second_insert: - /* FIXME, use some real flag for selecting the extra index */ - if (root =3D=3D root->fs_info->tree_root) { + if (!need_delayed_index) { ret =3D 0; - goto out_free; + goto out_free_prealloc; } btrfs_release_path(path); =20 - ret2 =3D btrfs_insert_delayed_dir_index(trans, name->name, name->len, dir, - &disk_key, type, index); -out_free: + ret2 =3D btrfs_insert_delayed_dir_index_prealloc(trans, dir, prealloc, + &disk_key, type, index); if (ret) return ret; - if (ret2) - return ret2; - return 0; + return ret2; + +out_free_prealloc: + btrfs_free_delayed_dir_index_prealloc(trans, prealloc); + return ret; } =20 static struct btrfs_dir_item *btrfs_lookup_match_dir( diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h index e52174a8baf9..d7a7d0b66f37 100644 --- a/fs/btrfs/dir-item.h +++ b/fs/btrfs/dir-item.h @@ -16,9 +16,11 @@ struct btrfs_trans_handle; =20 int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino, const struct fscrypt_str *name); +struct btrfs_dir_index_prealloc; int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const struct fscrypt_str *name, struct btrfs_inode *dir, - const struct btrfs_key *location, u8 type, u64 index); + const struct btrfs_key *location, u8 type, u64 index, + struct btrfs_dir_index_prealloc *prealloc); struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *tr= ans, struct btrfs_root *root, struct btrfs_path *path, u64 dir, @@ -53,5 +55,4 @@ static inline u64 btrfs_name_hash(const char *name, int l= en) { return crc32c((u32)~1, name, len); } - #endif diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3c10a0ef0002..3a2dca093c7d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6924,7 +6924,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, return ret; =20 ret =3D btrfs_insert_dir_item(trans, name, parent_inode, &key, - btrfs_inode_type(inode), index); + btrfs_inode_type(inode), index, NULL); if (ret =3D=3D -EEXIST || ret =3D=3D -EOVERFLOW) goto fail_dir_item; else if (unlikely(ret)) { diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index c641099d66e2..6fdfea5d35af 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1882,7 +1882,7 @@ static noinline int create_pending_snapshot(struct bt= rfs_trans_handle *trans, =20 ret =3D btrfs_insert_dir_item(trans, &fname.disk_name, parent_inode, &key, BTRFS_FT_DIR, - index); + index, NULL); if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); goto fail; --=20 2.55.0 From nobody Mon Sep 28 06:34:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9C0E533F599; Tue, 25 Aug 2026 16:04:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673900; cv=none; b=mo4Tp9GiEqFtXrQ43TpdaLUgzOUI6u7SbXSA//OQDE/SCG1eEYjhp/ij3Iuqv+UzPN0DjuWSz81ArdJFdZhhjxQ8SuMHRGMc2tbOnPE514s+scewTgIGcjinB9UebyxXAYyNjxD+7HDfSYrEYvACs2EiAv3AgKeBZkE/+sBLFX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673900; c=relaxed/simple; bh=i8QCxSVOV0LcFs+6/Mjy+uu1WcgS6N7H0r4iR2hOgvk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b4V+iWcvD9MGnkuY83OY189cktwnH1ZbLtjjeUBLFvfWKIN13NxDEsikdzO3Ok3wcQIGjLaW1gY3ikeonvyjqZrGgcOsxptZ4GYwvV0utWDdFp0NpmMEKqnDbTkl+XFDyawL3nzMqkc0NaYBNpUY8ay9HYnMWarPu5Vn9fbaWH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Mxlkg/pX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Mxlkg/pX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6C891F000E9; Tue, 25 Aug 2026 16:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787673899; bh=0KxVljklGd97b9rZMT8e3dxgS3KH3MdjoX7XMkwh6Ws=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Mxlkg/pXlqp1iY0GWQLs5Qy4ikG3PsSkdFWMdgUWcSi25RlzZU3eUXzbMR3sQg8if oAXfzBc7vYz2+iGRUKBtPkxTsesSTTV0LPal5zfNmrpUe5uB1XjI1hdUbBttA+Px90 vKqH2+ZGMhfwS2HF6aC+AixM4+D4Uy5/zrBFZiqoNCmj9wucNTRCzc332RCtJRj0Yp 2lyMWcynK5hIISy9ca1OKFRIkQ9h21AFgu39KHoiChWzk+EbU9oLOEtLFpscDzUKDC HHj4k1XU0GbbCI33W5EK0LFillnNfzlLnoRyZEDTCcf/QuZCZ2kFTVkVyJVC0XyFbm a20tjlCj/6ubQ== From: Jeff Layton Date: Tue, 25 Aug 2026 12:04:19 -0400 Subject: [PATCH v4 3/4] btrfs: handle ENOMEM from btrfs_insert_dir_item() without aborting Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-btrfs-enomem-v4-3-b9363fa8714a@kernel.org> References: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> In-Reply-To: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> To: Chris Mason , David Sterba Cc: Qu Wenruo , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2667; i=jlayton@kernel.org; h=from:subject:message-id; bh=i8QCxSVOV0LcFs+6/Mjy+uu1WcgS6N7H0r4iR2hOgvk=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqjb0nXsbRuLB/O//XQ8gUI0nUov+CJplV6cfyt DWI2u0otASJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCao29JwAKCRAADmhBGVaC Fc40EACWbJo4afArILrHkethA0h5h5wo4x69vZQnwwP7ogkW49uFNDwbn2ubO+Wuo7BvF/cgUqW WOSPsCVM+IFK/gyoO+cds63JkmcADVKyg1I494AXealDy2ns9Vqmj6BnzRcwrJXPuNsPouHwIVF CmWqaqOUDrHZjLVLhPff2YycYqQgejmzmeSLfd/SUEUphc51RJQGoWe0xtopMyFCuMqZ7Nf9Xl3 wpTfY/C1Tajqi+y1rZbnHN/mHTduetKWHeoVOKsA3bX2df8k6h1LTAA+K5aaUDpbI8Ib9g4ybF3 cOJckeGMLy1xqtuzMHec60bYpE7mYJv4WWGcxiLKRDPPTC7wrzLVdhBvkTv9CB632pQ9XDrgYq8 iOgkGNNGnUmlmgMjJWGhpUNKHu3BtnmZh8uL8ZvyLe8FFcxRRoKL5+iEZ9sFGAc3ytWNBHUOwAt pgFYIt2xbFkv54TXTX5y7+UAmBkOPzg6WkYuHAG7yT4prg/diuC6AbS7MIMtNs5nGo3SHx8nSWy DXcWUQ+O5zOXTSYg/18aQiFdWxrie2MIfyH4V5vpElLc/I5x7dcBwOCOtQgxFkVUKeZmrafAl1z d8+MPTDdbTn/B0NEkBYjGOztw9Q2PIFner8f4eEsXkyMYRTABlc1hxvXMTOxQd+mjUG2KyIAx+p Zd1hhEMx1/I6ZJA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Now that btrfs_insert_dir_item() returns -ENOMEM before modifying the btree (thanks to delayed dir index pre-allocation), callers can handle ENOMEM gracefully instead of aborting the transaction. - btrfs_add_link(): add -ENOMEM to the recoverable errors alongside -EEXIST and -EOVERFLOW. - btrfs_create_new_inode(): on -ENOMEM from btrfs_add_link(), orphan the newly-created inode instead of aborting. The inode item was already written with nlink 1, and discard_new_inode() marks it bad so eviction won't delete it. So clear_nlink() alone is not enough: persist nlink 0 via btrfs_update_inode(), otherwise orphan cleanup would see nlink > 0, drop the orphan item, and leak the inode. Fall back to aborting only if that update also fails. This turns a filesystem-killing abort into a graceful -ENOMEM return for create(), mkdir(), mknod(), symlink(), and link() under memory pressure. Assisted-by: LLM Signed-off-by: Jeff Layton --- fs/btrfs/inode.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3a2dca093c7d..5b79910d72f5 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6863,7 +6863,27 @@ int btrfs_create_new_inode(struct btrfs_trans_handle= *trans, } else { ret =3D btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), name, false, BTRFS_I(inode)->dir_index); - if (unlikely(ret)) { + if (ret =3D=3D -ENOMEM) { + /* + * Orphan the new inode instead of aborting. The inode + * item was already written with nlink 1, and discard's + * eviction won't delete a bad inode, so nlink 0 must be + * persisted here or orphan cleanup would see nlink > 0, + * drop the orphan item, and leak the inode. + */ + clear_nlink(inode); + /* btrfs_orphan_add() aborts the transaction on failure. */ + ret =3D btrfs_orphan_add(trans, BTRFS_I(inode)); + if (ret) + goto discard; + ret =3D btrfs_update_inode(trans, BTRFS_I(inode)); + if (ret) { + btrfs_abort_transaction(trans, ret); + goto discard; + } + ret =3D -ENOMEM; + goto discard; + } else if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); goto discard; } @@ -6925,7 +6945,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, =20 ret =3D btrfs_insert_dir_item(trans, name, parent_inode, &key, btrfs_inode_type(inode), index, NULL); - if (ret =3D=3D -EEXIST || ret =3D=3D -EOVERFLOW) + if (ret =3D=3D -EEXIST || ret =3D=3D -EOVERFLOW || ret =3D=3D -ENOMEM) goto fail_dir_item; else if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); --=20 2.55.0 From nobody Mon Sep 28 06:34:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 660D834041B; Tue, 25 Aug 2026 16:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673901; cv=none; b=nmmp85tDyVaS9LMs8ONcftVnWW6gcKua4tNIUb6M8ApvcSp2PBBDTZxedQYgQnIo9x6WUsPZowfS+Cm2HvvGfbBYS0YOfJWzHwu2FHIP5cqlwiRlAJoh1gTErCRx6pn07xekoHBZ+58QztHRwpAs0tVc3lybazsCP991HlJF2RE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787673901; c=relaxed/simple; bh=v8a82oH3QarP6I8CBddMNieJTg8G5gwPz33bnEBPH1I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uwZpTa4O3ocfM+dgSZV8n/kpHMcCwxzuFj448dm6tuU75D6RLPKfLbLvnHXZVZgp3YalRMbZ0A2JPmjRso82x2X5oCvv1bMoII1Do8YQtNGLGJP99b1HF45H06mctplvtoYdS6i6VmbszIS+iWu7UAj3tuAvyq5TiJjXF9y/za4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ITxrXo1t; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ITxrXo1t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B0351F00A3E; Tue, 25 Aug 2026 16:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787673900; bh=OXnftdUGJlC4cntuhv3BMGFqzvt2LM1k7YzvH1mHMHQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ITxrXo1t1HKwHocCHi7ijCdczL8VA2gmkECLjwr09rLctwOty5bvU8TBorAYNvJQ4 d0LiDWAXkZYkewjZNfEUCUEOrYq7VqCdimyxq0urxAorUguMrKaVKA8TpkTHHTU/0W FQ7NnR/sq5zFnzjM5atq0wUTrXlit2EnkAEVv6D45HRiz3TfFF8Tw/J8nwL41J+Yzr U7L1/OqjyAuC90QKzBB/JlpakEo1oC+lRzsywS+jfOgwId0PnyrqRMhtExm1GIfiBJ rn5t91N2sljUZk+Ncsc5ZfNG/eTDcMWma2PsrocfKkhH6Xv1/etEzGxEKCvtXY+uA8 5Du7czOZwnyqQ== From: Jeff Layton Date: Tue, 25 Aug 2026 12:04:20 -0400 Subject: [PATCH v4 4/4] btrfs: pre-allocate delayed dir index for non-overwrite rename Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-btrfs-enomem-v4-4-b9363fa8714a@kernel.org> References: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> In-Reply-To: <20260825-btrfs-enomem-v4-0-b9363fa8714a@kernel.org> To: Chris Mason , David Sterba Cc: Qu Wenruo , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7243; i=jlayton@kernel.org; h=from:subject:message-id; bh=v8a82oH3QarP6I8CBddMNieJTg8G5gwPz33bnEBPH1I=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqjb0oYSovQncDjqAV8XNLwiWoJGeckgBmMVTtu h5/ODmhow2JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCao29KAAKCRAADmhBGVaC FX30EAC8uLlpOauS5Ai7ab4snGxGew8rG2wKx2hqSIwxNEfk7Afei7/WzhiA3M+BimUlquO+60r xkuUjuva7cxFB1CvMPmFUckEOThvgKz0jsapGrpwM7ssngrhUMalIpuU8nHm02rTwsryloel743 D754HLOGgMG70W5WxRPsK0EkGmUXNHbdQtgE1U5hyhns8FHcrhPq/pRjTgq+++oQMfzM7/FQHOj lMVhdaS7P/FfjFOuU6jYUvOF99vG0wtoVegipb6XDwZ1rx6Nyv5RO9/v5By/LtDU3++YKjTc3mL 4pacmRHCoUbezVmFLMc/6SryKK5eQY7AeFHmC3b6OhR1y1J/PhobGd5DHGzFu6N55VCAkH4CJkK +05FvG7JkC6iQyTGJoBn5uYTawl/tax22Z7L1oYoxvO7N8+UX92ccls0E8RQLMJRx007N7+fpFi dga+uzkDrKrnrI22fu/CdXoUWliB0ULpAnmEFmDfiwURUyo6gqVj4vdfkMj8otag7K3irLfjaig odVOBLLtgjFumrJAav9pQE87dfs3hwYuouLqt9xLvx61OqOgkf6CIgtonXowWJzGZPAtVVSBdoo lasLSZ9RZyttfo7J/a39RRHX04zWF3oWYnogaBMspnIKwylH0q7/CnXQJ29/MzubdxWZqa/BZpZ rOBUjse5Qcpvoow== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 For rename() without an overwrite target, pre-allocate the delayed dir index before any btree modifications so that ENOMEM can be returned before the source is unlinked from the old directory. Add a prealloc parameter to btrfs_add_link() that allows callers to pass pre-allocated delayed dir index resources. When provided, btrfs_add_link() takes ownership: it either passes the prealloc to btrfs_insert_dir_item() (which commits or frees it), or frees it on early error. All existing callers pass NULL to preserve the current behavior. In btrfs_rename(), when new_inode is NULL (no overwrite), call btrfs_prealloc_delayed_dir_index() before the first btree modification and pass the result through to btrfs_add_link(). If the prealloc fails, -ENOMEM is returned before any btree state has changed. The local prealloc pointer is cleared once ownership passes to btrfs_add_link(), so the out_fail path only frees one we still own. For overwrite rename (new_inode !=3D NULL), the transaction still aborts on ENOMEM since earlier unlink operations have already made irreversible btree modifications. Assisted-by: LLM Signed-off-by: Jeff Layton --- fs/btrfs/btrfs_inode.h | 4 +++- fs/btrfs/inode.c | 40 ++++++++++++++++++++++++++++++++-------- fs/btrfs/tree-log.c | 4 ++-- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 1082fa92c145..d4280f152027 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -525,9 +525,11 @@ int btrfs_set_inode_index(struct btrfs_inode *dir, u64= *index); int btrfs_unlink_inode(struct btrfs_trans_handle *trans, struct btrfs_inode *dir, struct btrfs_inode *inode, const struct fscrypt_str *name); +struct btrfs_dir_index_prealloc; int btrfs_add_link(struct btrfs_trans_handle *trans, struct btrfs_inode *parent_inode, struct btrfs_inode *inode, - const struct fscrypt_str *name, bool add_backref, u64 index); + const struct fscrypt_str *name, bool add_backref, u64 index, + struct btrfs_dir_index_prealloc *prealloc); int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry); int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start,= u64 end); =20 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5b79910d72f5..fd6d481f4d12 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6862,7 +6862,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle = *trans, } } else { ret =3D btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), name, - false, BTRFS_I(inode)->dir_index); + false, BTRFS_I(inode)->dir_index, NULL); if (ret =3D=3D -ENOMEM) { /* * Orphan the new inode instead of aborting. The inode @@ -6914,7 +6914,8 @@ int btrfs_create_new_inode(struct btrfs_trans_handle = *trans, */ int btrfs_add_link(struct btrfs_trans_handle *trans, struct btrfs_inode *parent_inode, struct btrfs_inode *inode, - const struct fscrypt_str *name, bool add_backref, u64 index) + const struct fscrypt_str *name, bool add_backref, u64 index, + struct btrfs_dir_index_prealloc *prealloc) { int ret =3D 0; struct btrfs_key key; @@ -6940,11 +6941,13 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, } =20 /* Nothing to clean up yet */ - if (ret) + if (ret) { + btrfs_free_delayed_dir_index_prealloc(trans, prealloc); return ret; + } =20 ret =3D btrfs_insert_dir_item(trans, name, parent_inode, &key, - btrfs_inode_type(inode), index, NULL); + btrfs_inode_type(inode), index, prealloc); if (ret =3D=3D -EEXIST || ret =3D=3D -EOVERFLOW || ret =3D=3D -ENOMEM) goto fail_dir_item; else if (unlikely(ret)) { @@ -7098,7 +7101,7 @@ static int btrfs_link(struct dentry *old_dentry, stru= ct inode *dir, inode_set_ctime_current(inode); =20 ret =3D btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), - &fname.disk_name, true, index); + &fname.disk_name, true, index, NULL); if (ret) goto fail; =20 @@ -8512,14 +8515,14 @@ static int btrfs_rename_exchange(struct inode *old_= dir, } =20 ret =3D btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode), - new_name, false, old_idx); + new_name, false, old_idx, NULL); if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); goto out_fail; } =20 ret =3D btrfs_add_link(trans, BTRFS_I(old_dir), BTRFS_I(new_inode), - old_name, false, new_idx); + old_name, false, new_idx, NULL); if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); goto out_fail; @@ -8592,6 +8595,7 @@ static int btrfs_rename(struct mnt_idmap *idmap, struct inode *new_inode =3D d_inode(new_dentry); struct inode *old_inode =3D d_inode(old_dentry); struct btrfs_rename_ctx rename_ctx; + struct btrfs_dir_index_prealloc *prealloc =3D NULL; u64 index =3D 0; int ret; int ret2; @@ -8715,6 +8719,24 @@ static int btrfs_rename(struct mnt_idmap *idmap, if (ret) goto out_fail; =20 + /* + * When not overwriting an existing entry, pre-allocate the delayed + * dir index now so that ENOMEM is returned before any btree + * modifications. For the overwrite case, too many btree changes + * have already happened by the time btrfs_add_link() is called. + */ + if (!new_inode) { + prealloc =3D btrfs_prealloc_delayed_dir_index( + BTRFS_I(new_dir), + new_fname.disk_name.name, + new_fname.disk_name.len); + if (IS_ERR(prealloc)) { + ret =3D PTR_ERR(prealloc); + prealloc =3D NULL; + goto out_fail; + } + } + BTRFS_I(old_inode)->dir_index =3D 0ULL; if (unlikely(old_ino =3D=3D BTRFS_FIRST_FREE_OBJECTID)) { /* force full log commit if subvolume involved. */ @@ -8810,7 +8832,8 @@ static int btrfs_rename(struct mnt_idmap *idmap, } =20 ret =3D btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode), - &new_fname.disk_name, false, index); + &new_fname.disk_name, false, index, prealloc); + prealloc =3D NULL; if (unlikely(ret)) { btrfs_abort_transaction(trans, ret); goto out_fail; @@ -8835,6 +8858,7 @@ static int btrfs_rename(struct mnt_idmap *idmap, } } out_fail: + btrfs_free_delayed_dir_index_prealloc(trans, prealloc); if (logs_pinned) { btrfs_end_log_trans(root); btrfs_end_log_trans(dest); diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 7ba7b6098aa5..a043611f82e1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1683,7 +1683,7 @@ static noinline int add_inode_ref(struct walk_control= *wc) } =20 /* insert our name */ - ret =3D btrfs_add_link(trans, dir, inode, &name, false, ref_index); + ret =3D btrfs_add_link(trans, dir, inode, &name, false, ref_index, NULL= ); if (ret) { btrfs_abort_log_replay(wc, ret, "failed to add link for inode %llu in dir %llu ref_index %llu name %.*s ro= ot %llu", @@ -2031,7 +2031,7 @@ static noinline int insert_one_name(struct btrfs_tran= s_handle *trans, return PTR_ERR(dir); } =20 - ret =3D btrfs_add_link(trans, dir, inode, name, true, index); + ret =3D btrfs_add_link(trans, dir, inode, name, true, index, NULL); =20 /* FIXME, put inode into FIXUP list */ =20 --=20 2.55.0