Bug in btrfs_rename (kernel BUG at fs/btrfs/inode.c:5595!)

Commit Message

Josef Bacik Jan. 14, 2010, 5:03 p.m. UTC

None

Patch

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5440bab..c255dcb 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2096,6 +2096,13 @@  int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
 	 */
 	ret = btrfs_insert_orphan_item(trans, root, inode->i_ino);
 
+	printk(KERN_ERR "Btrfs: orphan add %llu\n", (unsigned long long)inode->i_ino);
+	dump_stack();
+	if (ret) {
+		printk(KERN_ERR "OH NO, ORPHAN ENTRY ALREADY EXISTS FOR %llu\n",
+		       (unsigned long long)inode->i_ino);
+	}
+
 	return ret;
 }
 
@@ -3293,10 +3300,10 @@  static int btrfs_setattr_size(struct inode *inode, struct iattr *attr)
 	unsigned long nr;
 	int ret;
 
-	if (attr->ia_size == inode->i_size)
+	if (attr->ia_size == i_size_read(inode))
 		return 0;
 
-	if (attr->ia_size > inode->i_size) {
+	if (attr->ia_size > i_size_read(inode)) {
 		unsigned long limit;
 		limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
 		if (attr->ia_size > inode->i_sb->s_maxbytes)
@@ -3305,24 +3312,7 @@  static int btrfs_setattr_size(struct inode *inode, struct iattr *attr)
 			send_sig(SIGXFSZ, current, 0);
 			return -EFBIG;
 		}
-	}
-
-	ret = btrfs_reserve_metadata_space(root, 1);
-	if (ret)
-		return ret;
-
-	trans = btrfs_start_transaction(root, 1);
-	btrfs_set_trans_block_group(trans, inode);
-
-	ret = btrfs_orphan_add(trans, inode);
-	BUG_ON(ret);
-
-	nr = trans->blocks_used;
-	btrfs_end_transaction(trans, root);
-	btrfs_unreserve_metadata_space(root, 1);
-	btrfs_btree_balance_dirty(root, nr);
 
-	if (attr->ia_size > inode->i_size) {
 		ret = btrfs_cont_expand(inode, attr->ia_size);
 		if (ret) {
 			btrfs_truncate(inode);
@@ -3345,6 +3335,21 @@  static int btrfs_setattr_size(struct inode *inode, struct iattr *attr)
 		btrfs_end_transaction(trans, root);
 		btrfs_btree_balance_dirty(root, nr);
 		return 0;
+	} else if (attr->ia_size < i_size_read(inode)) {
+		ret = btrfs_reserve_metadata_space(root, 1);
+		if (ret)
+			return ret;
+
+		trans = btrfs_start_transaction(root, 1);
+		btrfs_set_trans_block_group(trans, inode);
+
+		ret = btrfs_orphan_add(trans, inode);
+		BUG_ON(ret);
+
+		nr = trans->blocks_used;
+		btrfs_end_transaction(trans, root);
+		btrfs_unreserve_metadata_space(root, 1);
+		btrfs_btree_balance_dirty(root, nr);
 	}
 
 	/*
@@ -3355,10 +3360,6 @@  static int btrfs_setattr_size(struct inode *inode, struct iattr *attr)
 	if (attr->ia_size == 0)
 		BTRFS_I(inode)->ordered_data_close = 1;
 
-	/* we don't support swapfiles, so vmtruncate shouldn't fail */
-	ret = vmtruncate(inode, attr->ia_size);
-	BUG_ON(ret);
-
 	return 0;
 }
 
@@ -3376,7 +3377,6 @@  static int btrfs_setattr(struct dentry *dentry, struct iattr *attr)
 		if (err)
 			return err;
 	}
-	attr->ia_valid &= ~ATTR_SIZE;
 
 	if (attr->ia_valid)
 		err = inode_setattr(inode, attr);
@@ -5592,7 +5592,7 @@  static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		BUG_ON(ret);
 		if (new_inode->i_nlink == 0) {
 			ret = btrfs_orphan_add(trans, new_dentry->d_inode);
-			BUG_ON(ret);
+			BUG_ON(ret && ret != -EEXIST);
 		}
 	}