]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: fix limit for OCFS check
authorKarel Zak <kzak@redhat.com>
Mon, 30 Jan 2012 12:00:55 +0000 (13:00 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 30 Jan 2012 12:06:21 +0000 (13:06 +0100)
Rogier Goossens wrote:

 While testing KDE partitionmanager, I discovered that blkid did not
 detect the test OCFS2 filesystem I created. After some investigation,
 it appeared that it will assume the filesystem cannot be OCFS2 if
 smaller than 108M. However, mkfs.ocfs2 from ocfs2-tools (1.6.3) will
 happily create filesystems that are much smaller, only failing below
 approx. 15000 1k blocks, and below approx. 6000 4k blocks.

Reported-by: Rogier Goossens <goossens.rogier@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
libblkid/src/superblocks/ocfs.c

index 9dbf41b15df5515f70e00afa04ec9038f3916cff..82170ace12e4bf99e7f8cbcd1eea66b3b7d48587 100644 (file)
@@ -174,7 +174,7 @@ const struct blkid_idinfo ocfs_idinfo =
        .name           = "ocfs",
        .usage          = BLKID_USAGE_FILESYSTEM,
        .probefunc      = probe_ocfs,
-       .minsz          = 108 * 1024 * 1024,
+       .minsz          = 14000 * 1024,
        .magics         =
        {
                { .magic = "OracleCFS", .len = 9, .kboff = 8 },
@@ -187,7 +187,7 @@ const struct blkid_idinfo ocfs2_idinfo =
        .name           = "ocfs2",
        .usage          = BLKID_USAGE_FILESYSTEM,
        .probefunc      = probe_ocfs2,
-       .minsz          = 108 * 1024 * 1024,
+       .minsz          = 14000 * 1024,
        .magics         =
        {
                { .magic = "OCFSV2", .len = 6, .kboff = 1 },