On 10.05.2018 09:21, Omar Sandoval wrote:
> From: Omar Sandoval <osandov@xxxxxx>
>
> In btrfs_evict_inode(), if btrfs_truncate_inode_items() fails, the inode
> item will still be in the tree but we still return the ino to the ino
> cache. That will blow up later when someone tries to allocate that ino,
> so don't return it to the cache.
Make the subject a bit more expicit:
"Don't return ino to ino cache if inode item removal fails"
>
> Fixes: 581bb050941b ("Btrfs: Cache free inode numbers in memory")
> Signed-off-by: Omar Sandoval <osandov@xxxxxx>
> ---
> fs/btrfs/inode.c | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index e77df96de642..9a6a4e626e01 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -5368,13 +5368,18 @@ void btrfs_evict_inode(struct inode *inode)
> trans->block_rsv = rsv;
>
> ret = btrfs_truncate_inode_items(trans, root, inode, 0, 0);
> - if (ret != -ENOSPC && ret != -EAGAIN)
> + if (ret) {
> + trans->block_rsv = &fs_info->trans_block_rsv;
> + btrfs_end_transaction(trans);
> + btrfs_btree_balance_dirty(fs_info);
> + if (ret != -ENOSPC && ret != -EAGAIN) {
> + btrfs_orphan_del(NULL, BTRFS_I(inode));
> + btrfs_free_block_rsv(fs_info, rsv);
> + goto no_delete;
> + }
> + } else {
> break;
> -
> - trans->block_rsv = &fs_info->trans_block_rsv;
> - btrfs_end_transaction(trans);
> - trans = NULL;
> - btrfs_btree_balance_dirty(fs_info);
> + }
> }
>
> btrfs_free_block_rsv(fs_info, rsv);
> @@ -5383,12 +5388,8 @@ void btrfs_evict_inode(struct inode *inode)
> * Errors here aren't a big deal, it just means we leave orphan items
> * in the tree. They will be cleaned up on the next mount.
> */
> - if (ret == 0) {
> - trans->block_rsv = root->orphan_block_rsv;
> - btrfs_orphan_del(trans, BTRFS_I(inode));
> - } else {
> - btrfs_orphan_del(NULL, BTRFS_I(inode));
> - }
> + trans->block_rsv = root->orphan_block_rsv;
> + btrfs_orphan_del(trans, BTRFS_I(inode));
>
> trans->block_rsv = &fs_info->trans_block_rsv;
> if (!(root == fs_info->tree_root ||
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
