diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
| commit | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (patch) | |
| tree | 3a97a48d6f282f9e06c5446beeb886fcd86c4798 /fs/btrfs/tree-log.c | |
| parent | d756bd2d9339447c29bde950910586df8f8941ec (diff) | |
| parent | 6bf7e080d5bcb0d399ee38ce3dabbfad64448192 (diff) | |
| download | op-kernel-dev-9785dbdf265ddc47d5c88267d89a97648c0dc14b.zip op-kernel-dev-9785dbdf265ddc47d5c88267d89a97648c0dc14b.tar.gz | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 3568374..cb877e08 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -589,7 +589,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, ret = btrfs_inc_extent_ref(trans, root, ins.objectid, ins.offset, 0, root->root_key.objectid, - key->objectid, offset); + key->objectid, offset, 0); BUG_ON(ret); } else { /* |
