diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-28 15:00:39 +0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-28 15:00:39 +0400 |
| commit | ff5714cca971848963b87d6b477c16ca8abbaa54 (patch) | |
| tree | 17ee34b9b5e00804df4059503f82f6f1d94383a9 /fs/btrfs/xattr.c | |
| parent | 174ba50915b08dcfd07c8b5fb795b46a165fa09a (diff) | |
| parent | d90c732122a1f6d0efe388a8a204f67f144b2eb3 (diff) | |
| download | linux-ff5714cca971848963b87d6b477c16ca8abbaa54.tar.xz | |
Merge branch 'for-chris' of
git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus
Conflicts:
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
| -rw-r--r-- | fs/btrfs/xattr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index f3107e4b4d56..5366fe452ab0 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -158,8 +158,6 @@ int __btrfs_setxattr(struct btrfs_trans_handle *trans, if (IS_ERR(trans)) return PTR_ERR(trans); - btrfs_set_trans_block_group(trans, inode); - ret = do_setxattr(trans, inode, name, value, size, flags); if (ret) goto out; |