From 829fe1c89a7ff33bf9182c8ec3c1de00b510d4b5 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Tue, 26 Mar 2013 15:26:55 -0400 Subject: [PATCH] --- yaml --- r: 361955 b: refs/heads/master c: 6e137ed3f30574f314733d4b7a86ea6523232b14 h: refs/heads/master i: 361953: d6c0e8249aa1573f6abf0f3c160c6b5b4501c9cf 361951: 2abce6c53abc7ac6e31b813e0664cec9edfb9274 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a99e317d4095..25ac2c2cffea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4881bc7a83eff263789dd524b7c269d138d4af5 +refs/heads/master: 6e137ed3f30574f314733d4b7a86ea6523232b14 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 6a6e13c53086..8cab424c75f8 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -3693,11 +3693,9 @@ static struct btrfs_trans_handle *__unlink_start_trans(struct inode *dir, * 1 for the dir item * 1 for the dir index * 1 for the inode ref - * 1 for the inode ref in the tree log - * 2 for the dir entries in the log * 1 for the inode */ - trans = btrfs_start_transaction(root, 8); + trans = btrfs_start_transaction(root, 5); if (!IS_ERR(trans) || PTR_ERR(trans) != -ENOSPC) return trans; @@ -8141,7 +8139,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, * inodes. So 5 * 2 is 10, plus 1 for the new link, so 11 total items * should cover the worst case number of items we'll modify. */ - trans = btrfs_start_transaction(root, 20); + trans = btrfs_start_transaction(root, 11); if (IS_ERR(trans)) { ret = PTR_ERR(trans); goto out_notrans;