---

yaml --- r: 131061 b: refs/heads/master c: 8114494 h: refs/heads/master i: 131059: 721e42a v: v3
git-mirror · Feb 4, 2009 · 42498d5 · 42498d5
1 parent ce94064
commit 42498d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c087b5183adab186a298f2d6ed39aefdcae413c
+refs/heads/master: 811449496b3e3caa9a8cf43feacbade0153324f2
diff --git a/trunk/fs/btrfs/xattr.c b/trunk/fs/btrfs/xattr.c
@@ -98,7 +98,7 @@ int __btrfs_setxattr(struct inode *inode, const char *name,
 	if (!path)
 		return -ENOMEM;
 
-	trans = btrfs_start_transaction(root, 1);
+	trans = btrfs_join_transaction(root, 1);
 	btrfs_set_trans_block_group(trans, inode);
 
 	/* first lets see if we already have this xattr */