1 files changed, 50 insertions, 32 deletions

diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h
index efd5f970b501..691b52613ce4 100644
--- a/fs/ext4/extents_status.h
+++ b/fs/ext4/extents_status.h
@@ -29,25 +29,28 @@
 /*
  * These flags live in the high bits of extent_status.es_pblk
  */
-#define ES_SHIFT        60
-
-#define EXTENT_STATUS_WRITTEN   (1 << 3)
-#define EXTENT_STATUS_UNWRITTEN (1 << 2)
-#define EXTENT_STATUS_DELAYED   (1 << 1)
-#define EXTENT_STATUS_HOLE      (1 << 0)
+enum {
+        ES_WRITTEN_B,
+        ES_UNWRITTEN_B,
+        ES_DELAYED_B,
+        ES_HOLE_B,
+        ES_REFERENCED_B,
+        ES_FLAGS
+};
 
-#define EXTENT_STATUS_FLAGS     (EXTENT_STATUS_WRITTEN | \
-                                 EXTENT_STATUS_UNWRITTEN | \
-                                 EXTENT_STATUS_DELAYED | \
-                                 EXTENT_STATUS_HOLE)
+#define ES_SHIFT (sizeof(ext4_fsblk_t)*8 - ES_FLAGS)
+#define ES_MASK (~((ext4_fsblk_t)0) << ES_SHIFT)
 
-#define ES_WRITTEN              (1ULL << 63)
-#define ES_UNWRITTEN            (1ULL << 62)
-#define ES_DELAYED              (1ULL << 61)
-#define ES_HOLE                 (1ULL << 60)
+#define EXTENT_STATUS_WRITTEN   (1 << ES_WRITTEN_B)
+#define EXTENT_STATUS_UNWRITTEN (1 << ES_UNWRITTEN_B)
+#define EXTENT_STATUS_DELAYED   (1 << ES_DELAYED_B)
+#define EXTENT_STATUS_HOLE      (1 << ES_HOLE_B)
+#define EXTENT_STATUS_REFERENCED        (1 << ES_REFERENCED_B)
 
-#define ES_MASK                 (ES_WRITTEN | ES_UNWRITTEN | \
-                                 ES_DELAYED | ES_HOLE)
+#define ES_TYPE_MASK    ((ext4_fsblk_t)(EXTENT_STATUS_WRITTEN | \
+                          EXTENT_STATUS_UNWRITTEN | \
+                          EXTENT_STATUS_DELAYED | \
+                          EXTENT_STATUS_HOLE) << ES_SHIFT)
 
 struct ext4_sb_info;
 struct ext4_extent;
@@ -65,14 +68,13 @@ struct ext4_es_tree {
 };
 
 struct ext4_es_stats {
-        unsigned long es_stats_last_sorted;
         unsigned long es_stats_shrunk;
         unsigned long es_stats_cache_hits;
         unsigned long es_stats_cache_misses;
         u64 es_stats_scan_time;
         u64 es_stats_max_scan_time;
         struct percpu_counter es_stats_all_cnt;
-        struct percpu_counter es_stats_lru_cnt;
+        struct percpu_counter es_stats_shk_cnt;
 };
 
 extern int __init ext4_init_es(void);
@@ -93,29 +95,49 @@ extern void ext4_es_find_delayed_extent_range(struct inode *inode,
 extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,
                                  struct extent_status *es);
 
+static inline unsigned int ext4_es_status(struct extent_status *es)
+{
+        return es->es_pblk >> ES_SHIFT;
+}
+
+static inline unsigned int ext4_es_type(struct extent_status *es)
+{
+        return (es->es_pblk & ES_TYPE_MASK) >> ES_SHIFT;
+}
+
 static inline int ext4_es_is_written(struct extent_status *es)
 {
-        return (es->es_pblk & ES_WRITTEN) != 0;
+        return (ext4_es_type(es) & EXTENT_STATUS_WRITTEN) != 0;
 }
 
 static inline int ext4_es_is_unwritten(struct extent_status *es)
 {
-        return (es->es_pblk & ES_UNWRITTEN) != 0;
+        return (ext4_es_type(es) & EXTENT_STATUS_UNWRITTEN) != 0;
 }
 
 static inline int ext4_es_is_delayed(struct extent_status *es)
 {
-        return (es->es_pblk & ES_DELAYED) != 0;
+        return (ext4_es_type(es) & EXTENT_STATUS_DELAYED) != 0;
 }
 
 static inline int ext4_es_is_hole(struct extent_status *es)
 {
-        return (es->es_pblk & ES_HOLE) != 0;
+        return (ext4_es_type(es) & EXTENT_STATUS_HOLE) != 0;
 }
 
-static inline unsigned int ext4_es_status(struct extent_status *es)
+static inline void ext4_es_set_referenced(struct extent_status *es)
 {
-        return es->es_pblk >> ES_SHIFT;
+        es->es_pblk |= ((ext4_fsblk_t)EXTENT_STATUS_REFERENCED) << ES_SHIFT;
+}
+
+static inline void ext4_es_clear_referenced(struct extent_status *es)
+{
+        es->es_pblk &= ~(((ext4_fsblk_t)EXTENT_STATUS_REFERENCED) << ES_SHIFT);
+}
+
+static inline int ext4_es_is_referenced(struct extent_status *es)
+{
+        return (ext4_es_status(es) & EXTENT_STATUS_REFERENCED) != 0;
 }
 
 static inline ext4_fsblk_t ext4_es_pblock(struct extent_status *es)
@@ -135,23 +157,19 @@ static inline void ext4_es_store_pblock(struct extent_status *es,
 static inline void ext4_es_store_status(struct extent_status *es,
                                         unsigned int status)
 {
-        es->es_pblk = (((ext4_fsblk_t)
-                        (status & EXTENT_STATUS_FLAGS) << ES_SHIFT) |
-                       (es->es_pblk & ~ES_MASK));
+        es->es_pblk = (((ext4_fsblk_t)status << ES_SHIFT) & ES_MASK) |
+                      (es->es_pblk & ~ES_MASK);
 }
 
 static inline void ext4_es_store_pblock_status(struct extent_status *es,
                                                ext4_fsblk_t pb,
                                                unsigned int status)
 {
-        es->es_pblk = (((ext4_fsblk_t)
-                        (status & EXTENT_STATUS_FLAGS) << ES_SHIFT) |
-                       (pb & ~ES_MASK));
+        es->es_pblk = (((ext4_fsblk_t)status << ES_SHIFT) & ES_MASK) |
+                      (pb & ~ES_MASK);
 }
 
 extern int ext4_es_register_shrinker(struct ext4_sb_info *sbi);
 extern void ext4_es_unregister_shrinker(struct ext4_sb_info *sbi);
-extern void ext4_es_lru_add(struct inode *inode);
-extern void ext4_es_lru_del(struct inode *inode);
 
 #endif /* _EXT4_EXTENTS_STATUS_H */