From 42498d5b8e0153f93eb3b99abfa1dda0d9285ff1 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 4 Feb 2009 09:18:33 -0500 Subject: [PATCH] --- yaml --- r: 131061 b: refs/heads/master c: 811449496b3e3caa9a8cf43feacbade0153324f2 h: refs/heads/master i: 131059: 721e42a8fc864fd4dc05707267938737eb69399e v: v3 --- [refs] | 2 +- trunk/fs/btrfs/xattr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cdc6322f90ab..958a59aad509 100644 --- 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 index 312b9435e9f8..a9d3bf4d2689 100644 --- 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 */