btrfs: error path fixes for btrfs_link() and a cleanup
cover btrfs: error path fixes for btrfs_link() and a cleanup
From: Filipe Manana <[email protected]>
Fix a couple bugs in the error paths for btrfs_link() and a cleanup to make it more simple.
Filipe Manana (3):
btrfs: abort transaction on failure to add link to inode
btrfs: fix inode leak on failure to add link to inode
btrfs: simplify error handling logic for btrfs_link()
fs/btrfs/inode.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-)
Signature · 1 line
2.47.2
PATCH 1/3 btrfs: abort transaction on failure to add link to inode
From: Filipe Manana <[email protected]>
If we fail to update the inode or delete the orphan item, we must abort the transaction to prevent persisting an inconsistent state. For example if we fail to update the inode item, we have the inconsistency of having a persisted inode item with a link count of N but we have N + 1 inode ref items and N + 1 directory entries pointing to our inode in case the transaction gets committed.
--- fs/btrfs/inode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +6 -2
@@ -6845,16 +6845,20 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,struct dentry *parent = dentry->d_parent; ret =btrfs_update_inode (trans,BTRFS_I (inode)); -if (ret) +if (ret) { +btrfs_abort_transaction (trans, ret); goto fail; + }if (inode->i_nlink ==1 ) {/* * If new hard link count is 1, it's a file created * with open(2) O_TMPFILE flag. */ ret =btrfs_orphan_del (trans,BTRFS_I (inode)); -if (ret) +if (ret) { +btrfs_abort_transaction (trans, ret); goto fail; + } }d_instantiate (dentry, inode);btrfs_log_new_name (trans, old_dentry,NULL ,0 , parent);
Signature · 1 line
2.47.2
Re: [PATCH 1/3] btrfs: abort transaction on failure to add link to inode
Looks good,
PATCH 2/3 btrfs: fix inode leak on failure to add link to inode
In reply to [email protected]From: Filipe Manana <[email protected]>
If we fail to update the inode or delete the orphan item we leak the inode since we update its refcount with the ihold() call to account for the d_instantiate() call which never happens in case we fail those steps. Fix this by setting 'drop_inode' to true in case we fail those steps.
--- fs/btrfs/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/inode.c +2 -0
@@ -6847,6 +6847,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, ret =btrfs_update_inode (trans,BTRFS_I (inode));if (ret) {btrfs_abort_transaction (trans, ret); + drop_inode =1 ; goto fail; }if (inode->i_nlink ==1 ) {
@@ -6857,6 +6858,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, ret =btrfs_orphan_del (trans,BTRFS_I (inode));if (ret) {btrfs_abort_transaction (trans, ret); + drop_inode =1 ; goto fail; } }
Signature · 1 line
2.47.2
Re: [PATCH 2/3] btrfs: fix inode leak on failure to add link to inode
Looks good,
PATCH 3/3 btrfs: simplify error handling logic for btrfs_link()
In reply to [email protected]From: Filipe Manana <[email protected]>
Instead of incrementing the inode's link count and refcount early before adding the link, updating the inode and deleting orphan item, do it after all those steps succeeded right before calling d_instantiate(). This makes the error handling logic simpler by avoiding the need for the 'drop_inode' variable to signal if we need to undo the link count increment and the inode refcount increase under the 'fail' label.
This also reduces the level of indentation by one, making the code easier to read.
--- fs/btrfs/inode.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-)
fs/btrfs/inode.c +19 -26
@@ -6798,7 +6798,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,struct fscrypt_name fname;u64 index;int ret; -int drop_inode =0 ;/* do not allow sys_link's with other subvols of the same device */ if (btrfs_root_id (root) !=btrfs_root_id (BTRFS_I (inode)->root))
@@ -6830,50 +6829,44 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,/* There are several dir indexes for this inode, clear the cache. */ BTRFS_I (inode)->dir_index =0ULL ; -inc_nlink (inode);inode_inc_iversion (inode);inode_set_ctime_current (inode); -ihold (inode);set_bit (BTRFS_INODE_COPY_EVERYTHING , &BTRFS_I (inode)->runtime_flags); ret =btrfs_add_link (trans,BTRFS_I (dir),BTRFS_I (inode), &fname.disk_name,1 , index); +if (ret) + goto fail; +/* Link added now we update the inode item with the new link count. */ +inc_nlink (inode); + ret =btrfs_update_inode (trans,BTRFS_I (inode));if (ret) { - drop_inode =1 ; - }else { -struct dentry *parent = dentry->d_parent; +btrfs_abort_transaction (trans, ret); + goto fail; + } - ret =btrfs_update_inode (trans,BTRFS_I (inode)); +if (inode->i_nlink ==1 ) { +/* +* If the new hard link count is 1, it's a file created with the +* open(2) O_TMPFILE flag. +*/ + ret =btrfs_orphan_del (trans,BTRFS_I (inode));if (ret) {btrfs_abort_transaction (trans, ret); - drop_inode =1 ; goto fail; } -if (inode->i_nlink ==1 ) { -/* -* If new hard link count is 1, it's a file created -* with open(2) O_TMPFILE flag. -*/ - ret =btrfs_orphan_del (trans,BTRFS_I (inode)); -if (ret) { -btrfs_abort_transaction (trans, ret); - drop_inode =1 ; - goto fail; - } - } -d_instantiate (dentry, inode); -btrfs_log_new_name (trans, old_dentry,NULL ,0 , parent); } +/* Grab reference for the new dentry passed to d_instantiate(). */ +ihold (inode); +d_instantiate (dentry, inode); +btrfs_log_new_name (trans, old_dentry,NULL ,0 , dentry->d_parent); + fail:fscrypt_free_filename (&fname);if (trans)btrfs_end_transaction (trans); -if (drop_inode) { -inode_dec_link_count (inode); -iput (inode); - }btrfs_btree_balance_dirty (fs_info);return ret; }
Signature · 1 line
2.47.2
Re: [PATCH 3/3] btrfs: simplify error handling logic for btrfs_link()
fs/btrfs/inode.c static int btrfs_link(struct dentry *old_dentry, struct inode *dir, · line 6847
Quoted 10 lines · On 7/28/25 11:40 AM, [email protected] wrote:
fs/btrfs/inode.c +6
-3+/* Link added now we update the inode item with the new link count. */ +inc_nlink (inode); + ret =btrfs_update_inode (trans,BTRFS_I (inode));if (ret) { - drop_inode =1 ; - }else { -struct dentry *parent = dentry->d_parent; +btrfs_abort_transaction (trans, ret); + goto fail; + }
Don't we need to call "inode_dec_link_count(inode);" here? It used to be in the old "drop_inode" case but it's gone now. And in the commit message you state:
[...]This makes the error handling logic simpler by avoiding the need for the 'drop_inode' variable to signal if we need to undo the link count increment and the inode refcount increase under the 'fail' label.[...]
So the "undo inode refcount increase" part is gone now.
Re: [PATCH 3/3] btrfs: simplify error handling logic for btrfs_link()
Quoted 18 lines · Johannes Thumshirn
fs/btrfs/inode.c static int btrfs_link(struct dentry *old_dentry, struct inode *dir, · line 6847
Quoted 10 lines · On 7/28/25 11:40 AM, [email protected] wrote:
fs/btrfs/inode.c +6
-3+/* Link added now we update the inode item with the new link count. */ +inc_nlink (inode); + ret =btrfs_update_inode (trans,BTRFS_I (inode));if (ret) { - drop_inode =1 ; - }else { -struct dentry *parent = dentry->d_parent; +btrfs_abort_transaction (trans, ret); + goto fail; + }Don't we need to call "
inode_dec_link_count(inode);" here? It used to be in the old "drop_inode" case but it's gone now. And in the commit message you state:
Quoted 5 lines
[...]This makes the error handling logic simpler by avoiding the need for the '
drop_inode' variable to signal if we need to undo the link count increment and the inode refcount increase under the 'fail' label.[...]So the "undo inode refcount increase" part is gone now.
Yes it is gone, because if we fail to update the inode, it means we have added the new link so it's more correct to leave the incremented link count, since the inode has a new link.
In the end it doesn't matter much because we abort the transaction, so the new link is never persisted (and neither the incremented link count).
Thanks.
Quoted 1 line
Johannes Thumshirn
Reviewed-byRe: [PATCH 3/3] btrfs: simplify error handling logic for btrfs_link()
Quoted 27 lines · Filipe Manana
Quoted 16 lines · Johannes Thumshirn
fs/btrfs/inode.c static int btrfs_link(struct dentry *old_dentry, struct inode *dir, · line 6847
Quoted 10 lines · On 7/28/25 11:40 AM, [email protected] wrote:
fs/btrfs/inode.c +6
-3+/* Link added now we update the inode item with the new link count. */ +inc_nlink (inode); + ret =btrfs_update_inode (trans,BTRFS_I (inode));if (ret) { - drop_inode =1 ; - }else { -struct dentry *parent = dentry->d_parent; +btrfs_abort_transaction (trans, ret); + goto fail; + }Don't we need to call "
inode_dec_link_count(inode);" here? It used to be in the old "drop_inode" case but it's gone now. And in the commit message you state:Quoted 5 lines
[...]This makes the error handling logic simpler by avoiding the need for the '
drop_inode' variable to signal if we need to undo the link count increment and the inode refcount increase under the 'fail' label.[...]So the "undo inode refcount increase" part is gone now.
Yes it is gone, because if we fail to update the inode, it means we have added the new link so it's more correct to leave the incremented link count, since the inode has a new link.
Quoted 6 lines
In the end it doesn't matter much because we abort the transaction, so the new link is never persisted (and neither the incremented link count).
Thanks.
Ah OK that explains it then thanks.