Patchwork [09/11,RESEND] e4defrag: Use EXT2_SUPER_MAGIC instead of EXT4_SUPER_MAGIC

login
register
mail settings
Submitter Kazuya Mio
Date June 15, 2011, 6:37 a.m.
Message ID <4DF85320.4090402@sx.jp.nec.com>
Download mbox | patch
Permalink /patch/100487/
State Superseded
Headers show

Comments

Kazuya Mio - June 15, 2011, 6:37 a.m.
e2fsprogs has EXT2_SUPER_MAGIC defined for the magic number of
ext4 filesystem. e4defrag uses it instead of EXT4_SUPER_MAGIC.

Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com>
---
 misc/e4defrag.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/misc/e4defrag.c b/misc/e4defrag.c
index 6365103..b87aae9 100644
--- a/misc/e4defrag.c
+++ b/misc/e4defrag.c
@@ -91,9 +91,6 @@ 
 #define FS_EXT4			"ext4"
 #define ROOT_UID		0
 
-/* Magic number for ext4 */
-#define EXT4_SUPER_MAGIC	0xEF53
-
 /* The following macro is used for ioctl FS_IOC_FIEMAP
  * EXTENT_MAX_COUNT:	the maximum number of extents for exchanging between
  *			kernel-space and user-space per ioctl
@@ -293,7 +290,7 @@  static int is_ext4(const char *file)
 		return -1;
 	}
 
-	if (fsbuf.f_type != EXT4_SUPER_MAGIC) {
+	if (fsbuf.f_type != EXT2_SUPER_MAGIC) {
 		PRINT_ERR_MSG(NGMSG_EXT4);
 		return -1;
 	}