diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-08-16 18:33:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-08-16 18:33:27 +0000 |
| commit | 409da46acddecf9f154afe9f287f23ad97e1dad2 (patch) | |
| tree | 9c675c1d061555b3a3ab32f7a3f1090a6da6680a /sys-apps/util-linux/files | |
| parent | old (diff) | |
| download | gentoo-2-409da46acddecf9f154afe9f287f23ad97e1dad2.tar.gz gentoo-2-409da46acddecf9f154afe9f287f23ad97e1dad2.tar.bz2 gentoo-2-409da46acddecf9f154afe9f287f23ad97e1dad2.zip | |
Add fix from upstream for detecting ext2 filesystems with ext4-only #279054 by sl.
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/util-linux/files')
| -rw-r--r-- | sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch b/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch new file mode 100644 index 000000000000..fe2838dbf1ae --- /dev/null +++ b/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/279054 + +From 92cf3ab964266603cf36272d0eec96cd07fa083c Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 13 Aug 2009 21:55:43 +0200 +Subject: [PATCH] libblkid: fix ext2 detection on systems with ext4 only + +Address-Red-Hat-Bug: #513104 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + shlibs/blkid/src/probers/ext.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c +index 671e556..a4d35d1 100644 +--- a/shlibs/blkid/src/probers/ext.c ++++ b/shlibs/blkid/src/probers/ext.c +@@ -483,11 +483,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag) + if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) + return -BLKID_ERR_PARAM; + +- /* Ext4 has at least one feature which ext3 doesn't understand */ +- if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) && +- !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) +- return -BLKID_ERR_PARAM; +- + /* + * If the filesystem does not have a journal and ext2 is not + * present, then force this to be detected as an ext2 +@@ -498,6 +493,12 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag) + get_linux_version() >= EXT4_SUPPORTS_EXT2) + goto force_ext4; + ++ /* Ext4 has at least one feature which ext3 doesn't understand */ ++ if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) && ++ !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) ++ return -BLKID_ERR_PARAM; ++ ++force_ext4: + /* + * If the filesystem is a OK for use by in-development + * filesystem code, and ext4dev is supported or ext4 is not +@@ -513,7 +514,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag) + return -BLKID_ERR_PARAM; + } + +-force_ext4: + ext_get_info(pr, 4, es); + return 0; + } +-- +1.6.3.3 + |