summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/e2p/ChangeLog4
-rw-r--r--lib/e2p/pf.c1
-rw-r--r--lib/ext2fs/ChangeLog6
-rw-r--r--lib/ext2fs/ext2_fs.h4
-rw-r--r--misc/ChangeLog4
-rw-r--r--misc/filefrag.c4
6 files changed, 19 insertions, 4 deletions
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 641e7d8d..4dfaba73 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-05 Theodore Tso <tytso@mit.edu>
+
+ * pf.c: Add support for EXT4_EXTENTS_FL flag.
+
2006-05-08 Theodore Tso <tytso@mit.edu>
* feature.c: Add support for EXT2_FEATURE_COMPAT_LAZY_BG feature.
diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c
index 48d75a9a..3e9a7cd9 100644
--- a/lib/e2p/pf.c
+++ b/lib/e2p/pf.c
@@ -44,6 +44,7 @@ static struct flags_name flags_array[] = {
{ EXT2_INDEX_FL, "I", "Indexed_direcctory" },
{ EXT2_NOTAIL_FL, "t", "No_Tailmerging" },
{ EXT2_TOPDIR_FL, "T", "Top_of_Directory_Hierarchies" },
+ { EXT4_EXTENTS_FL, "e", "Extents" },
{ 0, NULL, NULL }
};
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 1ac7e237..0bd5a212 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-05 Theodore Tso <tytso@mit.edu>
+
+ * ext2_fs.h (EXT4_EXTENTS_FL): Rename EXT3_EXTENTS_FL to
+ EXT4_EXTENTS_FL, and add EXT4_EXTENTS_FL to user visible
+ flags list.
+
2006-07-15 Theodore Tso <tytso@mit.edu>
* ext2fs.h: Remove unneeded #ifdef since EXT2_DYNAMIC_REV is
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 1cfbc358..d3e39f2b 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -236,10 +236,10 @@ struct ext2_dx_countlimit {
#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT2_DIRSYNC_FL 0x00010000 /* Synchronous directory modifications */
#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-#define EXT3_EXTENTS_FL 0x00080000 /* Inode uses extents */
+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
-#define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+#define EXT2_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
#define EXT2_FL_USER_MODIFIABLE 0x000080FF /* User modifiable flags */
/*
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 2d57d56e..d489bf19 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-05 Theodore Tso <tytso@mit.edu>
+
+ * filefrag.c: Change EXT3_EXTENTS_FL to EXT4_EXTENTS_FL
+
2006-07-15 Theodore Tso <tytso@mit.edu>
* mke2fs.c (PRS): Look up the default inode size in the
diff --git a/misc/filefrag.c b/misc/filefrag.c
index 5d144ffa..0719d4ce 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -44,7 +44,7 @@ int verbose = 0;
#define FIBMAP _IO(0x00,1) /* bmap access */
#define FIGETBSZ _IO(0x00,2) /* get the block size used for bmap */
-#define EXT3_EXTENTS_FL 0x00080000 /* Inode uses extents */
+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT3_IOC_GETFLAGS _IOR('f', 1, long)
static unsigned long get_bmap(int fd, unsigned long block)
@@ -126,7 +126,7 @@ static void frag_report(const char *filename)
}
if (ioctl(fd, EXT3_IOC_GETFLAGS, &flags) < 0)
flags = 0;
- if (flags & EXT3_EXTENTS_FL) {
+ if (flags & EXT4_EXTENTS_FL) {
printf("File is stored in extents format\n");
is_ext2 = 0;
}