git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[pandora-kernel.git]
/
fs
/
btrfs
/
extent_map.h
diff --git
a/fs/btrfs/extent_map.h
b/fs/btrfs/extent_map.h
index
ab6d74b
..
28b44db
100644
(file)
--- a/
fs/btrfs/extent_map.h
+++ b/
fs/btrfs/extent_map.h
@@
-26,7
+26,8
@@
struct extent_map {
unsigned long flags;
struct block_device *bdev;
atomic_t refs;
- int in_tree;
+ unsigned int in_tree:1;
+ unsigned int compress_type:4;
};
struct extent_map_tree {