Rename EXT3_EXTENTS_FL to EXT4_EXTENTS_FL and make it visible to the user

lsattr will display the EXT4_EXTENTS_FL flag

Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 641e7d8dc9b59476555d8da1964ff479461e15bd..4dfaba73f4b3c899ef7a56f0677676e4975a7e6b 100644 (file)
--- 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 48d75a9ae5ca125ee5c056d3fe7d988d9ff792ec..3e9a7cd9e8bb849c8f91c1ed21e565f9f0d3c4fc 100644 (file)
--- 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 1ac7e2375b8630dfed8264d1bd7d9b000c039925..0bd5a212ed97d8e35982a11da2d7f155eddd1567 100644 (file)
--- 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 1cfbc3580a1a44020883187774894c260e3777bf..d3e39f2b2ce52381d777a607cd153fa6061f504a 100644 (file)
--- 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 2d57d56e29232d93dcdaf05a824c32b31739200a..d489bf1935ac781492eaea290bc02cf9ed1d72b3 100644 (file)
--- 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 5d144ffa35e7b862372ed58fa5c30ef9eaa56380..0719d4cef5b0c2b8a04b5c09773b4105372fc847 100644 (file)
--- 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;
        }