From 7b4c7a681cc4c0a53dc8a8baf4853e921cfbf5de Mon Sep 17 00:00:00 2001 From: bigbiff Date: Thu, 1 Jan 2015 19:44:14 -0500 Subject: Update blkid to 2.25.0 Break libblkid into 4 libraries: libblkid, libuuid, libutil-linux and libfdisk. This should help in later patch updates. Change-Id: I680d9a7feb031e5c29a603e9c58aff4b65826262 --- libblkid/jfs.c | 71 ---------------------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 libblkid/jfs.c (limited to 'libblkid/jfs.c') diff --git a/libblkid/jfs.c b/libblkid/jfs.c deleted file mode 100644 index 78c018c15..000000000 --- a/libblkid/jfs.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 1999 by Andries Brouwer - * Copyright (C) 1999, 2000, 2003 by Theodore Ts'o - * Copyright (C) 2001 by Andreas Dilger - * Copyright (C) 2004 Kay Sievers - * Copyright (C) 2008 Karel Zak - * - * This file may be redistributed under the terms of the - * GNU Lesser General Public License. - */ -#include -#include -#include -#include -#include -#include -#include - -#include "superblocks.h" - -struct jfs_super_block { - unsigned char js_magic[4]; - uint32_t js_version; - uint64_t js_size; - uint32_t js_bsize; /* 4: aggregate block size in bytes */ - uint16_t js_l2bsize; /* 2: log2 of s_bsize */ - uint16_t js_l2bfactor; /* 2: log2(s_bsize/hardware block size) */ - uint32_t js_pbsize; /* 4: hardware/LVM block size in bytes */ - uint16_t js_l2pbsize; /* 2: log2 of s_pbsize */ - uint16_t js_pad; /* 2: padding necessary for alignment */ - uint32_t js_dummy2[26]; - unsigned char js_uuid[16]; - unsigned char js_label[16]; - unsigned char js_loguuid[16]; -}; - -static int probe_jfs(blkid_probe pr, const struct blkid_idmag *mag) -{ - struct jfs_super_block *js; - - js = blkid_probe_get_sb(pr, mag, struct jfs_super_block); - if (!js) - return -1; - if (le32_to_cpu(js->js_bsize) != (1U << le16_to_cpu(js->js_l2bsize))) - return 1; - if (le32_to_cpu(js->js_pbsize) != (1U << le16_to_cpu(js->js_l2pbsize))) - return 1; - if ((le16_to_cpu(js->js_l2bsize) - le16_to_cpu(js->js_l2pbsize)) != - le16_to_cpu(js->js_l2bfactor)) - return 1; - - if (strlen((char *) js->js_label)) - blkid_probe_set_label(pr, js->js_label, sizeof(js->js_label)); - blkid_probe_set_uuid(pr, js->js_uuid); - return 0; -} - - -const struct blkid_idinfo jfs_idinfo = -{ - .name = "jfs", - .usage = BLKID_USAGE_FILESYSTEM, - .probefunc = probe_jfs, - .minsz = 16 * 1024 * 1024, - .magics = - { - { .magic = "JFS1", .len = 4, .kboff = 32 }, - { NULL } - } -}; - -- cgit v1.2.3