blkid: recognize ext4(dev) without journal

PATCH Applied Eric Sandeen 2 participants 2 messages Feb 25, 2009 – Mar 9, 2009

lore

Share & tools

lore

Eric Sandeen

author

2009-02-25 05:17 UTC #0 lore raw

PATCH 1/1 blkid: recognize ext4(dev) without journal

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 <[email protected]>

---

lib/blkid/probe.c +0 -9

Index: 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;

Theodore Tso

Applied

2009-03-09 03:31 UTC #1 lore raw

Quoted 4 lines · Eric Sandeen

ext4/ext4dev no longer require a journal.
w/o this blkid doesn't recognize after:

Quoted 8 lines

# 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 <[email protected]>

Thanks, applied to the e2fsprogs git tree.

- Ted