diff options
Diffstat (limited to 'fs/ext4/extents_status.h')
-rw-r--r-- | fs/ext4/extents_status.h | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index e936730cc5b0..167f4ab8ecc3 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h | |||
@@ -29,16 +29,26 @@ | |||
29 | /* | 29 | /* |
30 | * These flags live in the high bits of extent_status.es_pblk | 30 | * These flags live in the high bits of extent_status.es_pblk |
31 | */ | 31 | */ |
32 | #define EXTENT_STATUS_WRITTEN (1ULL << 63) | 32 | #define ES_SHIFT 60 |
33 | #define EXTENT_STATUS_UNWRITTEN (1ULL << 62) | 33 | |
34 | #define EXTENT_STATUS_DELAYED (1ULL << 61) | 34 | #define EXTENT_STATUS_WRITTEN (1 << 3) |
35 | #define EXTENT_STATUS_HOLE (1ULL << 60) | 35 | #define EXTENT_STATUS_UNWRITTEN (1 << 2) |
36 | #define EXTENT_STATUS_DELAYED (1 << 1) | ||
37 | #define EXTENT_STATUS_HOLE (1 << 0) | ||
36 | 38 | ||
37 | #define EXTENT_STATUS_FLAGS (EXTENT_STATUS_WRITTEN | \ | 39 | #define EXTENT_STATUS_FLAGS (EXTENT_STATUS_WRITTEN | \ |
38 | EXTENT_STATUS_UNWRITTEN | \ | 40 | EXTENT_STATUS_UNWRITTEN | \ |
39 | EXTENT_STATUS_DELAYED | \ | 41 | EXTENT_STATUS_DELAYED | \ |
40 | EXTENT_STATUS_HOLE) | 42 | EXTENT_STATUS_HOLE) |
41 | 43 | ||
44 | #define ES_WRITTEN (1ULL << 63) | ||
45 | #define ES_UNWRITTEN (1ULL << 62) | ||
46 | #define ES_DELAYED (1ULL << 61) | ||
47 | #define ES_HOLE (1ULL << 60) | ||
48 | |||
49 | #define ES_MASK (ES_WRITTEN | ES_UNWRITTEN | \ | ||
50 | ES_DELAYED | ES_HOLE) | ||
51 | |||
42 | struct ext4_sb_info; | 52 | struct ext4_sb_info; |
43 | struct ext4_extent; | 53 | struct ext4_extent; |
44 | 54 | ||
@@ -60,7 +70,10 @@ extern void ext4_es_init_tree(struct ext4_es_tree *tree); | |||
60 | 70 | ||
61 | extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, | 71 | extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, |
62 | ext4_lblk_t len, ext4_fsblk_t pblk, | 72 | ext4_lblk_t len, ext4_fsblk_t pblk, |
63 | unsigned long long status); | 73 | unsigned int status); |
74 | extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, | ||
75 | ext4_lblk_t len, ext4_fsblk_t pblk, | ||
76 | unsigned int status); | ||
64 | extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, | 77 | extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, |
65 | ext4_lblk_t len); | 78 | ext4_lblk_t len); |
66 | extern void ext4_es_find_delayed_extent_range(struct inode *inode, | 79 | extern void ext4_es_find_delayed_extent_range(struct inode *inode, |
@@ -68,36 +81,35 @@ extern void ext4_es_find_delayed_extent_range(struct inode *inode, | |||
68 | struct extent_status *es); | 81 | struct extent_status *es); |
69 | extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk, | 82 | extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk, |
70 | struct extent_status *es); | 83 | struct extent_status *es); |
71 | extern int ext4_es_zeroout(struct inode *inode, struct ext4_extent *ex); | ||
72 | 84 | ||
73 | static inline int ext4_es_is_written(struct extent_status *es) | 85 | static inline int ext4_es_is_written(struct extent_status *es) |
74 | { | 86 | { |
75 | return (es->es_pblk & EXTENT_STATUS_WRITTEN) != 0; | 87 | return (es->es_pblk & ES_WRITTEN) != 0; |
76 | } | 88 | } |
77 | 89 | ||
78 | static inline int ext4_es_is_unwritten(struct extent_status *es) | 90 | static inline int ext4_es_is_unwritten(struct extent_status *es) |
79 | { | 91 | { |
80 | return (es->es_pblk & EXTENT_STATUS_UNWRITTEN) != 0; | 92 | return (es->es_pblk & ES_UNWRITTEN) != 0; |
81 | } | 93 | } |
82 | 94 | ||
83 | static inline int ext4_es_is_delayed(struct extent_status *es) | 95 | static inline int ext4_es_is_delayed(struct extent_status *es) |
84 | { | 96 | { |
85 | return (es->es_pblk & EXTENT_STATUS_DELAYED) != 0; | 97 | return (es->es_pblk & ES_DELAYED) != 0; |
86 | } | 98 | } |
87 | 99 | ||
88 | static inline int ext4_es_is_hole(struct extent_status *es) | 100 | static inline int ext4_es_is_hole(struct extent_status *es) |
89 | { | 101 | { |
90 | return (es->es_pblk & EXTENT_STATUS_HOLE) != 0; | 102 | return (es->es_pblk & ES_HOLE) != 0; |
91 | } | 103 | } |
92 | 104 | ||
93 | static inline ext4_fsblk_t ext4_es_status(struct extent_status *es) | 105 | static inline unsigned int ext4_es_status(struct extent_status *es) |
94 | { | 106 | { |
95 | return (es->es_pblk & EXTENT_STATUS_FLAGS); | 107 | return es->es_pblk >> ES_SHIFT; |
96 | } | 108 | } |
97 | 109 | ||
98 | static inline ext4_fsblk_t ext4_es_pblock(struct extent_status *es) | 110 | static inline ext4_fsblk_t ext4_es_pblock(struct extent_status *es) |
99 | { | 111 | { |
100 | return (es->es_pblk & ~EXTENT_STATUS_FLAGS); | 112 | return es->es_pblk & ~ES_MASK; |
101 | } | 113 | } |
102 | 114 | ||
103 | static inline void ext4_es_store_pblock(struct extent_status *es, | 115 | static inline void ext4_es_store_pblock(struct extent_status *es, |
@@ -105,19 +117,16 @@ static inline void ext4_es_store_pblock(struct extent_status *es, | |||
105 | { | 117 | { |
106 | ext4_fsblk_t block; | 118 | ext4_fsblk_t block; |
107 | 119 | ||
108 | block = (pb & ~EXTENT_STATUS_FLAGS) | | 120 | block = (pb & ~ES_MASK) | (es->es_pblk & ES_MASK); |
109 | (es->es_pblk & EXTENT_STATUS_FLAGS); | ||
110 | es->es_pblk = block; | 121 | es->es_pblk = block; |
111 | } | 122 | } |
112 | 123 | ||
113 | static inline void ext4_es_store_status(struct extent_status *es, | 124 | static inline void ext4_es_store_status(struct extent_status *es, |
114 | unsigned long long status) | 125 | unsigned int status) |
115 | { | 126 | { |
116 | ext4_fsblk_t block; | 127 | es->es_pblk = (((ext4_fsblk_t) |
117 | 128 | (status & EXTENT_STATUS_FLAGS) << ES_SHIFT) | | |
118 | block = (status & EXTENT_STATUS_FLAGS) | | 129 | (es->es_pblk & ~ES_MASK)); |
119 | (es->es_pblk & ~EXTENT_STATUS_FLAGS); | ||
120 | es->es_pblk = block; | ||
121 | } | 130 | } |
122 | 131 | ||
123 | extern void ext4_es_register_shrinker(struct ext4_sb_info *sbi); | 132 | extern void ext4_es_register_shrinker(struct ext4_sb_info *sbi); |