From: Karel Zak Date: Mon, 30 Jan 2012 12:00:55 +0000 (+0100) Subject: libblkid: fix limit for OCFS check X-Git-Tag: v2.21-rc2~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6baa15039873aac5513abde621f60c63537b88e9;p=thirdparty%2Futil-linux.git libblkid: fix limit for OCFS check 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 Signed-off-by: Karel Zak --- diff --git a/libblkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c index 9dbf41b15d..82170ace12 100644 --- a/libblkid/src/superblocks/ocfs.c +++ b/libblkid/src/superblocks/ocfs.c @@ -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 },