diff options
| author | David Sterba <dsterba@suse.cz> | 2011-10-24 14:47:58 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-24 14:47:58 +0200 |
| commit | a81d3b1ba2f5faae28ba7a092c7598673fa02ac2 (patch) | |
| tree | 8301fefcd9f3d45be9d0030456a86bca5b9ff061 /fs/btrfs/relocation.c | |
| parent | afd582ac8f10382002a72b4d17d9c2db328ed8b8 (diff) | |
| parent | f9d9ef62cd3ecbd6cbb7957a253c1e81f69d5586 (diff) | |
| download | op-kernel-dev-a81d3b1ba2f5faae28ba7a092c7598673fa02ac2.zip op-kernel-dev-a81d3b1ba2f5faae28ba7a092c7598673fa02ac2.tar.gz | |
Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 10af6a0..24d654c 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3322,8 +3322,11 @@ static int find_data_references(struct reloc_control *rc, } key.objectid = ref_objectid; - key.offset = ref_offset; key.type = BTRFS_EXTENT_DATA_KEY; + if (ref_offset > ((u64)-1 << 32)) + key.offset = 0; + else + key.offset = ref_offset; path->search_commit_root = 1; path->skip_locking = 1; |
