volume_id: disable detection routines which are not setting label and uuid anyway

function                                             old     new   delta
static.warn                                            1       -      -1
static.drive_name_string                              14      12      -2
static.offsets                                         8       -      -8
static.sectors                                        10       -     -10
fs2                                                   60      48     -12
raid2                                                 16       -     -16
uuidcache_init                                       704     677     -27
raid1                                                 32       -     -32
volume_id_probe_all                                  198     158     -40
volume_id_probe_lvm1                                  58       -     -58
volume_id_probe_highpoint_37x_raid                    63       -     -63
volume_id_probe_hpfs                                  67       -     -67
volume_id_probe_minix                                 74       -     -74
volume_id_probe_lvm2                                  78       -     -78
volume_id_probe_silicon_medley_raid                   97       -     -97
volume_id_probe_via_raid                             101       -    -101
volume_id_probe_highpoint_45x_raid                   104       -    -104
volume_id_probe_nvidia_raid                          108       -    -108
volume_id_probe_lsi_mega_raid                        108       -    -108
volume_id_probe_intel_software_raid                  108       -    -108
volume_id_probe_ufs                                  126       -    -126
volume_id_probe_promise_fasttrack_raid               144       -    -144
------------------------------------------------------------------------------
(add/remove: 0/18 grow/shrink: 0/4 up/down: 0/-1384)        Total: -1384 bytes
   text    data     bss     dec     hex filename
 794244     662    7420  802326   c3e16 busybox_old
 792698     662    7420  800780   c380c busybox_unstripped

1 files changed, 0 insertions, 206 deletions

diff --git a/util-linux/volume_id/ufs.c b/util-linux/volume_id/ufs.c
deleted file mode 100644
index ba76876b5..000000000
--- a/util-linux/volume_id/ufs.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "volume_id_internal.h"
-
-struct ufs_super_block {
-	uint32_t	fs_link;
-	uint32_t	fs_rlink;
-	uint32_t	fs_sblkno;
-	uint32_t	fs_cblkno;
-	uint32_t	fs_iblkno;
-	uint32_t	fs_dblkno;
-	uint32_t	fs_cgoffset;
-	uint32_t	fs_cgmask;
-	uint32_t	fs_time;
-	uint32_t	fs_size;
-	uint32_t	fs_dsize;
-	uint32_t	fs_ncg;	
-	uint32_t	fs_bsize;
-	uint32_t	fs_fsize;
-	uint32_t	fs_frag;
-	uint32_t	fs_minfree;
-	uint32_t	fs_rotdelay;
-	uint32_t	fs_rps;	
-	uint32_t	fs_bmask;
-	uint32_t	fs_fmask;
-	uint32_t	fs_bshift;
-	uint32_t	fs_fshift;
-	uint32_t	fs_maxcontig;
-	uint32_t	fs_maxbpg;
-	uint32_t	fs_fragshift;
-	uint32_t	fs_fsbtodb;
-	uint32_t	fs_sbsize;
-	uint32_t	fs_csmask;
-	uint32_t	fs_csshift;
-	uint32_t	fs_nindir;
-	uint32_t	fs_inopb;
-	uint32_t	fs_nspf;
-	uint32_t	fs_optim;
-	uint32_t	fs_npsect_state;
-	uint32_t	fs_interleave;
-	uint32_t	fs_trackskew;
-	uint32_t	fs_id[2];
-	uint32_t	fs_csaddr;
-	uint32_t	fs_cssize;
-	uint32_t	fs_cgsize;
-	uint32_t	fs_ntrak;
-	uint32_t	fs_nsect;
-	uint32_t	fs_spc;	
-	uint32_t	fs_ncyl;
-	uint32_t	fs_cpg;
-	uint32_t	fs_ipg;
-	uint32_t	fs_fpg;
-	struct ufs_csum {
-		uint32_t	cs_ndir;
-		uint32_t	cs_nbfree;
-		uint32_t	cs_nifree;
-		uint32_t	cs_nffree;
-	} __attribute__((__packed__)) fs_cstotal;
-	int8_t		fs_fmod;
-	int8_t		fs_clean;
-	int8_t		fs_ronly;
-	int8_t		fs_flags;
-	union {
-		struct {
-			int8_t	fs_fsmnt[512];
-			uint32_t	fs_cgrotor;
-			uint32_t	fs_csp[31];
-			uint32_t	fs_maxcluster;
-			uint32_t	fs_cpc;
-			uint16_t	fs_opostbl[16][8];
-		} __attribute__((__packed__)) fs_u1;
-		struct {
-			int8_t		fs_fsmnt[468];
-			uint8_t		fs_volname[32];
-			uint64_t	fs_swuid;
-			int32_t		fs_pad;
-			uint32_t	fs_cgrotor;
-			uint32_t	fs_ocsp[28];
-			uint32_t	fs_contigdirs;
-			uint32_t	fs_csp;	
-			uint32_t	fs_maxcluster;
-			uint32_t	fs_active;
-			int32_t		fs_old_cpc;
-			int32_t		fs_maxbsize;
-			int64_t		fs_sparecon64[17];
-			int64_t		fs_sblockloc;
-			struct ufs2_csum_total {
-				uint64_t	cs_ndir;
-				uint64_t	cs_nbfree;
-				uint64_t	cs_nifree;
-				uint64_t	cs_nffree;
-				uint64_t	cs_numclusters;
-				uint64_t	cs_spare[3];
-			} __attribute__((__packed__)) fs_cstotal;
-			struct ufs_timeval {
-				int32_t		tv_sec;
-				int32_t		tv_usec;
-			} __attribute__((__packed__)) fs_time;
-			int64_t		fs_size;
-			int64_t		fs_dsize;
-			uint64_t	fs_csaddr;
-			int64_t		fs_pendingblocks;
-			int32_t		fs_pendinginodes;
-		} __attribute__((__packed__)) fs_u2;
-	}  fs_u11;
-	union {
-		struct {
-			int32_t		fs_sparecon[53];
-			int32_t		fs_reclaim;
-			int32_t		fs_sparecon2[1];
-			int32_t		fs_state;
-			uint32_t	fs_qbmask[2];
-			uint32_t	fs_qfmask[2];
-		} __attribute__((__packed__)) fs_sun;
-		struct {
-			int32_t		fs_sparecon[53];
-			int32_t		fs_reclaim;
-			int32_t		fs_sparecon2[1];
-			uint32_t	fs_npsect;
-			uint32_t	fs_qbmask[2];
-			uint32_t	fs_qfmask[2];
-		} __attribute__((__packed__)) fs_sunx86;
-		struct {
-			int32_t		fs_sparecon[50];
-			int32_t		fs_contigsumsize;
-			int32_t		fs_maxsymlinklen;
-			int32_t		fs_inodefmt;
-			uint32_t	fs_maxfilesize[2];
-			uint32_t	fs_qbmask[2];
-			uint32_t	fs_qfmask[2];
-			int32_t		fs_state;
-		} __attribute__((__packed__)) fs_44;
-	} fs_u2;
-	int32_t		fs_postblformat;
-	int32_t		fs_nrpos;
-	int32_t		fs_postbloff;
-	int32_t		fs_rotbloff;
-	uint32_t	fs_magic;
-	uint8_t		fs_space[1];
-} __attribute__((__packed__));
-
-#define UFS_MAGIC			0x00011954
-#define UFS2_MAGIC			0x19540119
-#define UFS_MAGIC_FEA			0x00195612
-#define UFS_MAGIC_LFN			0x00095014
-
-int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
-{
-	static const short offsets[] = { 0, 8, 64, 256 };
-
-	uint32_t magic;
-	int i;
-	struct ufs_super_block *ufs;
-
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
-
-	for (i = 0; i < ARRAY_SIZE(offsets); i++) {	
-		ufs = volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
-		if (ufs == NULL)
-			return -1;
-
-		dbg("offset 0x%x", offsets[i] * 0x400);
-		magic = ufs->fs_magic;
-		if ((magic == cpu_to_be32(UFS_MAGIC))
-		 || (magic == cpu_to_be32(UFS2_MAGIC))
-		 || (magic == cpu_to_be32(UFS_MAGIC_FEA))
-		 || (magic == cpu_to_be32(UFS_MAGIC_LFN))
-		) {
-			dbg("magic 0x%08x(be)", magic);
-			goto found;
-		}
-		if ((magic == cpu_to_le32(UFS_MAGIC))
-		 || (magic == cpu_to_le32(UFS2_MAGIC))
-		 || (magic == cpu_to_le32(UFS_MAGIC_FEA))
-		 || (magic == cpu_to_le32(UFS_MAGIC_LFN))
-		) {
-			dbg("magic 0x%08x(le)", magic);
-			goto found;
-		}
-	}
-	return -1;
-
- found:
-//	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//	id->type = "ufs";
-
-	return 0;
-}