From: Omar Sandoval Date: Fri, 11 May 2018 20:13:40 +0000 (-0700) Subject: Btrfs: reserve space for O_TMPFILE orphan item deletion X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=399b0bbf5f680797d3599fa14f16706ffc470145;p=openwrt%2Fstaging%2Fblogic.git Btrfs: reserve space for O_TMPFILE orphan item deletion btrfs_link() calls btrfs_orphan_del() if it's linking an O_TMPFILE but it doesn't reserve space to do so. Even before the removal of the orphan_block_rsv it wasn't using it. Fixes: ef3b9af50bfa ("Btrfs: implement inode_operations callback tmpfile") Reviewed-by: Filipe Manana Signed-off-by: Omar Sandoval Signed-off-by: David Sterba --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b247ea31c436..6e9cb5338964 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6658,8 +6658,9 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, * 2 items for inode and inode ref * 2 items for dir items * 1 item for parent inode + * 1 item for orphan item deletion if O_TMPFILE */ - trans = btrfs_start_transaction(root, 5); + trans = btrfs_start_transaction(root, inode->i_nlink ? 5 : 6); if (IS_ERR(trans)) { err = PTR_ERR(trans); trans = NULL;