deleted file mode 100644
@@ -1,40 +0,0 @@
-/*
- * fs/ext4/delayed_extents.h
- *
- * Written by Yongqiang Yang <xiaoqiangnk@gmail.com>
- *
- */
-
-#ifndef _EXT4_DELAYED_EXTENTS_H
-#define _EXT4_DELAYED_EXTENTS_H
-
-#define DE_DEBUG
-#ifdef DE_DEBUG
-#define de_debug(a...) printk(a)
-#else
-#define de_debug(a...)
-#endif
-
-struct delayed_extent {
- struct rb_node rb_node;
- ext4_lblk_t start; /* first block extent covers */
- ext4_lblk_t len; /* length of extent in block */
-};
-
-struct ext4_de_tree {
- struct rb_root root;
- struct delayed_extent *cache_de; /* recently accessed extent */
-};
-
-extern int __init ext4_init_de(void);
-extern void ext4_exit_de(void);
-extern void ext4_de_init_tree(struct ext4_de_tree *tree);
-
-extern int ext4_de_add_space(struct inode *inode, ext4_lblk_t start,
- ext4_lblk_t len);
-extern int ext4_de_remove_space(struct inode *inode, ext4_lblk_t start,
- ext4_lblk_t len);
-extern ext4_lblk_t ext4_de_find_extent(struct inode *inode,
- struct delayed_extent *de);
-
-#endif /* _EXT4_DELAYED_EXTENTS_H */
@@ -782,7 +782,7 @@ struct ext4_ext_cache {
__u32 ec_len; /* must be 32bit to return holes */
};
-#include "delayed_extents.h"
+#include "status_extents.h"
/*
* fourth extended file system inode data in memory
@@ -862,7 +862,7 @@ struct ext4_inode_info {
spinlock_t i_prealloc_lock;
/* delayed extents */
- struct ext4_de_tree i_de_tree;
+ struct ext4_se_tree i_se_tree;
/* ialloc */
ext4_group_t i_last_alloc_group;
new file mode 100644
@@ -0,0 +1,22 @@
+/*
+ * fs/ext4/status_extents.h
+ *
+ * Written by Yongqiang Yang <xiaoqiangnk@gmail.com>
+ *
+ */
+
+#ifndef _EXT4_STATUS_EXTENTS_H
+#define _EXT4_STATUS_EXTENTS_H
+
+struct status_extent {
+ struct rb_node rb_node;
+ ext4_lblk_t start; /* first block extent covers */
+ ext4_lblk_t len; /* length of extent in block */
+};
+
+struct ext4_se_tree {
+ struct rb_root root;
+ struct status_extent *cache_se; /* recently accessed extent */
+};
+
+#endif /* _EXT4_STATUS_EXTENTS_H */
This patch renames changes introduced by patch "[PATCH_V3_1_6]ext4_add_two_structures_supporting_delayed_extent_tree" All code referencing "delayed extents" or "de" are changed to "status extents" or "se" Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com> --- :100644 000000 cfd122e... 0000000... D fs/ext4/delayed_extents.h :100644 100644 f908208... 896f2fb... M fs/ext4/ext4.h :000000 100644 0000000... cbf96ed... A fs/ext4/status_extents.h fs/ext4/delayed_extents.h | 40 ---------------------------------------- fs/ext4/ext4.h | 4 ++-- fs/ext4/status_extents.h | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 42 deletions(-)