From 7b4c7a681cc4c0a53dc8a8baf4853e921cfbf5de Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
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/ioctl.c | 74 --------------------------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 libblkid/ioctl.c

(limited to 'libblkid/ioctl.c')

diff --git a/libblkid/ioctl.c b/libblkid/ioctl.c
deleted file mode 100644
index 3aba09e4f..000000000
--- a/libblkid/ioctl.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * ioctl based topology -- gathers topology information
- *
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
- *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
- *
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "topology.h"
-
-/*
- * ioctl topology values
- */
-static struct topology_val {
-
-	long  ioc;
-
-	/* functions to set probing result */
-	int (*set_ulong)(blkid_probe, unsigned long);
-	int (*set_int)(blkid_probe, int);
-
-} topology_vals[] = {
-	{ BLKALIGNOFF, NULL, blkid_topology_set_alignment_offset },
-	{ BLKIOMIN, blkid_topology_set_minimum_io_size },
-	{ BLKIOOPT, blkid_topology_set_optimal_io_size },
-	{ BLKPBSZGET, blkid_topology_set_physical_sector_size }
-	/* we read BLKSSZGET in topology.c */
-};
-
-static int probe_ioctl_tp(blkid_probe pr,
-		const struct blkid_idmag *mag __attribute__((__unused__)))
-{
-	size_t i;
-
-	for (i = 0; i < ARRAY_SIZE(topology_vals); i++) {
-		struct topology_val *val = &topology_vals[i];
-		int rc = 1;
-		unsigned int data;
-
-		if (ioctl(pr->fd, val->ioc, &data) == -1)
-			goto nothing;
-
-		if (val->set_int)
-			rc = val->set_int(pr, (int) data);
-		else
-			rc = val->set_ulong(pr, (unsigned long) data);
-		if (rc)
-			goto err;
-	}
-
-	return 0;
-nothing:
-	return 1;
-err:
-	return -1;
-}
-
-const struct blkid_idinfo ioctl_tp_idinfo =
-{
-	.name		= "ioctl",
-	.probefunc	= probe_ioctl_tp,
-	.magics		= BLKID_NONE_MAGIC
-};
-
-- 
cgit v1.2.3