diff mbox

blkid: recognize ext4(dev) without journal

Message ID 49A4D482.7000900@redhat.com
State Accepted, archived
Headers show

Commit Message

Eric Sandeen Feb. 25, 2009, 5:17 a.m. UTC 
ext4/ext4dev no longer require a journal.

w/o this blkid doesn't recognize after:

# mkfs.ext4 /dev/blah
# tune2fs -O ^has_journal
# blkid /dev/blah

We still must have one ext3-incompat-feature to flag
as ext4(dev) so we shouldn't ever mis-recognize it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---


--
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

Comments

Theodore Ts'o March 8, 2009, 11:22 p.m. UTC | #1 
On Tue, Feb 24, 2009 at 11:17:54PM -0600, Eric Sandeen wrote:
> ext4/ext4dev no longer require a journal.
> 
> w/o this blkid doesn't recognize after:
> 
> # mkfs.ext4 /dev/blah
> # tune2fs -O ^has_journal
> # blkid /dev/blah
> 
> We still must have one ext3-incompat-feature to flag
> as ext4(dev) so we shouldn't ever mis-recognize it.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Thanks, applied to the e2fsprogs git tree.

						- Ted
--
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
diff mbox

Patch

Index: e2fsprogs/lib/blkid/probe.c
===================================================================
--- e2fsprogs.orig/lib/blkid/probe.c
+++ e2fsprogs/lib/blkid/probe.c
@@ -281,11 +281,6 @@  static int probe_ext4dev(struct blkid_pr
 	    EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
 		return -BLKID_ERR_PARAM;
 
-	/* ext4dev requires a journal */
-	if (!(blkid_le32(es->s_feature_compat) &
-	      EXT3_FEATURE_COMPAT_HAS_JOURNAL))
-		return -BLKID_ERR_PARAM;
-
 	/*
 	 * If the filesystem is marked as OK for use by in-development
 	 * filesystem code, but ext4dev is not supported, and ext4 is,
@@ -317,11 +312,6 @@  static int probe_ext4(struct blkid_probe
 	    EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
 		return -BLKID_ERR_PARAM;
 
-	/* ext4 requires journal */
-	if (!(blkid_le32(es->s_feature_compat) &
-	      EXT3_FEATURE_COMPAT_HAS_JOURNAL))
-		return -BLKID_ERR_PARAM;
-
 	/* Ext4 has at least one feature which ext3 doesn't understand */
 	if (!(blkid_le32(es->s_feature_ro_compat) &
 	      EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&