diff -up util-linux-2.23.2/libblkid/src/blkidP.h.kzak util-linux-2.23.2/libblkid/src/blkidP.h

--- util-linux-2.23.2/libblkid/src/blkidP.h.kzak	2014-03-28 15:11:18.334283704 +0100

+++ util-linux-2.23.2/libblkid/src/blkidP.h	2014-03-28 15:11:44.676551975 +0100

@@ -297,6 +297,9 @@ struct blkid_struct_cache

 /* old systems */

 #define BLKID_CACHE_FILE_OLD	"/etc/blkid.tab"

+#define BLKID_PROBE_OK	 0

+#define BLKID_PROBE_NONE 1

+

 #define BLKID_ERR_IO	 5

 #define BLKID_ERR_PROC	 9

 #define BLKID_ERR_MEM	12

diff -up util-linux-2.23.2/libblkid/src/partitions/aix.c.kzak util-linux-2.23.2/libblkid/src/partitions/aix.c

--- util-linux-2.23.2/libblkid/src/partitions/aix.c.kzak	2013-05-30 15:21:43.120591308 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/aix.c	2014-03-28 15:11:44.676551975 +0100

@@ -22,19 +22,17 @@ static int probe_aix_pt(blkid_probe pr,

 	if (blkid_partitions_need_typeonly(pr))

 		/* caller does not ask for details about partitions */

-		return 0;

+		return BLKID_PROBE_OK;

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		return BLKID_PROBE_NONE;

 	tab = blkid_partlist_new_parttable(ls, "aix", 0);

 	if (!tab)

-		goto err;

+		return -ENOMEM;

-	return 0;

-err:

-	return -1;

+	return BLKID_PROBE_OK;

 }

 /*

diff -up util-linux-2.23.2/libblkid/src/partitions/bsd.c.kzak util-linux-2.23.2/libblkid/src/partitions/bsd.c

--- util-linux-2.23.2/libblkid/src/partitions/bsd.c.kzak	2013-07-15 10:25:46.283049056 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/bsd.c	2014-03-28 15:11:44.677551986 +0100

@@ -113,20 +113,24 @@ static int probe_bsd_pt(blkid_probe pr,

 	blkid_partlist ls;

 	int i, nparts = BSD_MAXPARTITIONS;

 	unsigned char *data;

+	int rc = BLKID_PROBE_NONE;

 	if (blkid_partitions_need_typeonly(pr))

 		/* caller does not ask for details about partitions */

-		return 0;

+		return rc;

 	data = blkid_probe_get_sector(pr, BLKID_MAG_SECTOR(mag));

-	if (!data)

+	if (!data) {

+		if (errno)

+			rc = -errno;

 		goto nothing;

+	}

 	l = (struct bsd_disklabel *) data + BLKID_MAG_LASTOFFSET(mag);

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	/* try to determine the real type of BSD system according to

 	 * (parental) primary partition */

@@ -152,8 +156,10 @@ static int probe_bsd_pt(blkid_probe pr,

 	}

 	tab = blkid_partlist_new_parttable(ls, name, BLKID_MAG_OFFSET(mag));

-	if (!tab)

-		goto err;

+	if (!tab) {

+		rc = -ENOMEM;

+		goto nothing;

+	}

 	if (le16_to_cpu(l->d_npartitions) < BSD_MAXPARTITIONS)

 		nparts = le16_to_cpu(l->d_npartitions);

@@ -189,18 +195,18 @@ static int probe_bsd_pt(blkid_probe pr,

 		}

 		par = blkid_partlist_add_partition(ls, tab, start, size);

-		if (!par)

-			goto err;

+		if (!par) {

+			rc = -ENOMEM;

+			goto nothing;

+		}

 		blkid_partition_set_type(par, p->p_fstype);

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

-err:

-	return -1;

+	return rc;

 }

diff -up util-linux-2.23.2/libblkid/src/partitions/dos.c.kzak util-linux-2.23.2/libblkid/src/partitions/dos.c

--- util-linux-2.23.2/libblkid/src/partitions/dos.c.kzak	2013-07-30 10:39:26.205738229 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/dos.c	2014-03-28 15:13:23.220555797 +0100

@@ -53,10 +53,13 @@ static int parse_dos_extended(blkid_prob

 		uint32_t start, size;

 		if (++ct_nodata > 100)

-			return 0;

+			return BLKID_PROBE_OK;

 		data = blkid_probe_get_sector(pr, cur_start);

-		if (!data)

+		if (!data) {

+			if (errno)

+				return -errno;

 			goto leave;	/* malformed partition? */

+		}

 		if (!is_valid_mbr_signature(data))

 			goto leave;

@@ -99,7 +102,7 @@ static int parse_dos_extended(blkid_prob

 			par = blkid_partlist_add_partition(ls, tab, abs_start, size);

 			if (!par)

-				goto err;

+				return -ENOMEM;

 			blkid_partition_set_type(par, p->sys_type);

 			blkid_partition_set_flags(par, p->boot_ind);

@@ -123,9 +126,7 @@ static int parse_dos_extended(blkid_prob

 		cur_size = size;

 	}

 leave:

-	return 0;

-err:

-	return -1;

+	return BLKID_PROBE_OK;

 }

 static int probe_dos_pt(blkid_probe pr,

@@ -140,8 +141,11 @@ static int probe_dos_pt(blkid_probe pr,

 	uint32_t start, size, id;

 	data = blkid_probe_get_sector(pr, 0);

-	if (!data)

+	if (!data) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	/* ignore disks with AIX magic number -- for more details see aix.c */

 	if (memcmp(data, BLKID_AIX_MAGIC_STRING, BLKID_AIX_MAGIC_STRLEN) == 0)

@@ -152,7 +156,7 @@ static int probe_dos_pt(blkid_probe pr,

 	 * either the boot sector of a FAT filesystem or a DOS-type

 	 * partition table.

 	 */

-	if (blkid_probe_is_vfat(pr)) {

+	if (blkid_probe_is_vfat(pr) == 1) {

 		DBG(LOWPROBE, blkid_debug("probably FAT -- ignore"));

 		goto nothing;

 	}

@@ -189,6 +193,8 @@ static int probe_dos_pt(blkid_probe pr,

 		return 0;

 	ls = blkid_probe_get_partlist(pr);

+	if (!ls)

+		goto nothing;

 	/* sector size factor (the start and size are in the real sectors, but

 	 * we need to convert all sizes to 512 logical sectors

@@ -198,7 +204,7 @@ static int probe_dos_pt(blkid_probe pr,

 	/* allocate a new partition table */

 	tab = blkid_partlist_new_parttable(ls, "dos", BLKID_MSDOS_PT_OFFSET);

 	if (!tab)

-		goto err;

+		return -ENOMEM;

 	id = dos_parttable_id(data);

 	if (id) {

@@ -224,7 +230,7 @@ static int probe_dos_pt(blkid_probe pr,

 		}

 		par = blkid_partlist_add_partition(ls, tab, start, size);

 		if (!par)

-			goto err;

+			return -ENOMEM;

 		blkid_partition_set_type(par, p->sys_type);

 		blkid_partition_set_flags(par, p->boot_ind);

@@ -244,13 +250,14 @@ static int probe_dos_pt(blkid_probe pr,

 			continue;

 		if (is_extended(p) &&

 		    parse_dos_extended(pr, tab, start, size, ssf) == -1)

-			goto err;

+			goto nothing;

 	}

 	/* Parse subtypes (nested partitions) on large disks */

 	if (!blkid_probe_is_tiny(pr)) {

 		for (p = p0, i = 0; i < 4; i++, p++) {

 			size_t n;

+			int rc;

 			if (!dos_partition_size(p) || is_extended(p))

 				continue;

@@ -259,20 +266,19 @@ static int probe_dos_pt(blkid_probe pr,

 				if (dos_nested[n].type != p->sys_type)

 					continue;

-				if (blkid_partitions_do_subprobe(pr,

+				rc = blkid_partitions_do_subprobe(pr,

 						blkid_partlist_get_partition(ls, i),

-						dos_nested[n].id) == -1)

-					goto err;

+						dos_nested[n].id);

+				if (rc < 0)

+					return rc;

 				break;

 			}

 		}

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

-err:

-	return -1;

+	return BLKID_PROBE_NONE;

 }

diff -up util-linux-2.23.2/libblkid/src/partitions/gpt.c.kzak util-linux-2.23.2/libblkid/src/partitions/gpt.c

--- util-linux-2.23.2/libblkid/src/partitions/gpt.c.kzak	2014-03-28 15:11:18.336283724 +0100

+++ util-linux-2.23.2/libblkid/src/partitions/gpt.c	2014-03-28 15:11:44.677551986 +0100

@@ -169,8 +169,11 @@ static int is_pmbr_valid(blkid_probe pr,

 		goto ok;			/* skip PMBR check */

 	data = blkid_probe_get_sector(pr, 0);

-	if (!data)

+	if (!data) {

+		if (errno)

+			return -errno;

 		goto failed;

+	}

 	if (!is_valid_mbr_signature(data))

 		goto failed;

@@ -305,19 +308,27 @@ static int probe_gpt_pt(blkid_probe pr,

 	uint64_t fu, lu;

 	uint32_t ssf, i;

 	efi_guid_t guid;

+	int ret;

 	if (last_lba(pr, &lastlba))

 		goto nothing;

-	if (!is_pmbr_valid(pr, NULL))

+	ret = is_pmbr_valid(pr, NULL);

+	if (ret < 0)

+		return ret;

+	else if (ret == 0)

 		goto nothing;

+	errno = 0;

 	h = get_gpt_header(pr, &hdr, &e, (lba = GPT_PRIMARY_LBA), lastlba);

-	if (!h)

+	if (!h && !errno)

 		h = get_gpt_header(pr, &hdr, &e, (lba = lastlba), lastlba);

-	if (!h)

+	if (!h) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	blkid_probe_use_wiper(pr, lba * blkid_probe_get_size(pr), 8);

@@ -388,12 +399,13 @@ static int probe_gpt_pt(blkid_probe pr,

 		blkid_partition_set_flags(par, e->attributes);

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

+

 err:

-	return -1;

+	return -ENOMEM;

 }

diff -up util-linux-2.23.2/libblkid/src/partitions/mac.c.kzak util-linux-2.23.2/libblkid/src/partitions/mac.c

--- util-linux-2.23.2/libblkid/src/partitions/mac.c.kzak	2013-06-13 09:46:10.418650605 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/mac.c	2014-03-28 15:11:44.677551986 +0100

@@ -87,8 +87,11 @@ static int probe_mac_pt(blkid_probe pr,

 	 * the first block on the disk.

 	 */

 	md = (struct mac_driver_desc *) blkid_probe_get_sector(pr, 0);

-	if (!md)

+	if (!md) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	block_size = be16_to_cpu(md->block_size);

@@ -96,8 +99,11 @@ static int probe_mac_pt(blkid_probe pr,

 	 * the second block on the disk.

 	 */

 	p = (struct mac_partition *) get_mac_block(pr, block_size, 1);

-	if (!p)

+	if (!p) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	/* check the first partition signature */

 	if (!has_part_signature(p))

@@ -109,7 +115,7 @@ static int probe_mac_pt(blkid_probe pr,

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	tab = blkid_partlist_new_parttable(ls, "mac", 0);

 	if (!tab)

@@ -124,15 +130,18 @@ static int probe_mac_pt(blkid_probe pr,

 		uint32_t size;

 		p = (struct mac_partition *) get_mac_block(pr, block_size, i);

-		if (!p)

+		if (!p) {

+			if (errno)

+				return -errno;

 			goto nothing;

+		}

 		if (!has_part_signature(p))

 			goto nothing;

 		if (be32_to_cpu(p->map_count) != nblks) {

 			DBG(LOWPROBE, blkid_debug(

 				"mac: inconsisten map_count in partition map, "

-			        "entry[0]: %d, entry[%d]: %d",

+				"entry[0]: %d, entry[%d]: %d",

 				nblks, i - 1,

 				be32_to_cpu(p->map_count)));

 		}

@@ -157,12 +166,12 @@ static int probe_mac_pt(blkid_probe pr,

 						sizeof(p->type));

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

 err:

-	return -1;

+	return -ENOMEM;

 }

 /*

diff -up util-linux-2.23.2/libblkid/src/partitions/minix.c.kzak util-linux-2.23.2/libblkid/src/partitions/minix.c

--- util-linux-2.23.2/libblkid/src/partitions/minix.c.kzak	2013-07-15 10:25:46.284049064 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/minix.c	2014-03-28 15:36:23.866715100 +0100

@@ -26,12 +26,15 @@ static int probe_minix_pt(blkid_probe pr

 	int i;

 	data = blkid_probe_get_sector(pr, 0);

-	if (!data)

+	if (!data) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	/* Parent is required, because Minix uses the same PT as DOS and

 	 * difference is only in primary partition (parent) type.

@@ -78,12 +81,12 @@ static int probe_minix_pt(blkid_probe pr

 		blkid_partition_set_flags(par, p->boot_ind);

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

 err:

-	return -1;

+	return -ENOMEM;

 }

 /* same as DOS */

diff -up util-linux-2.23.2/libblkid/src/partitions/partitions.c.kzak util-linux-2.23.2/libblkid/src/partitions/partitions.c

--- util-linux-2.23.2/libblkid/src/partitions/partitions.c.kzak	2014-03-28 15:11:18.336283724 +0100

+++ util-linux-2.23.2/libblkid/src/partitions/partitions.c	2014-03-28 15:12:28.036993622 +0100

@@ -533,12 +533,13 @@ static int idinfo_probe(blkid_probe pr,

 {

 	const struct blkid_idmag *mag = NULL;

 	blkid_loff_t off;

-	int rc = 1;		/* = nothing detected */

+	int rc = BLKID_PROBE_NONE;		/* = nothing detected */

 	if (pr->size <= 0 || (id->minsz && id->minsz > pr->size))

 		goto nothing;	/* the device is too small */

-	if (blkid_probe_get_idmag(pr, id, &off, &mag))

+	rc = blkid_probe_get_idmag(pr, id, &off, &mag;;

+	if (rc != BLKID_PROBE_OK)

 		goto nothing;

 	/* final check by probing function */

@@ -546,14 +547,15 @@ static int idinfo_probe(blkid_probe pr,

 		DBG(LOWPROBE, blkid_debug(

 			"%s: ---> call probefunc()", id->name));

 		rc = id->probefunc(pr, mag);

-	        if (rc == -1) {

+		if (rc < 0) {

 			/* reset after error */

 			reset_partlist(blkid_probe_get_partlist(pr));

 			if (chn && !chn->binary)

 				blkid_probe_chain_reset_vals(pr, chn);

-			DBG(LOWPROBE, blkid_debug("%s probefunc failed", id->name));

+			DBG(LOWPROBE, blkid_debug("%s probefunc failed, rc %d",

+						  id->name, rc));

 		}

-		if (rc == 0 && mag && chn && !chn->binary)

+		if (rc == BLKID_PROBE_OK && mag && chn && !chn->binary)

 			rc = blkid_probe_set_magic(pr, off, mag->len,

 					(unsigned char *) mag->magic);

@@ -569,11 +571,11 @@ nothing:

  */

 static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)

 {

-	int rc = 1;

+	int rc = BLKID_PROBE_NONE;

 	size_t i;

 	if (!pr || chn->idx < -1)

-		return -1;

+		return -EINVAL;

 	blkid_probe_chain_reset_vals(pr, chn);

 	if (chn->binary)

@@ -597,7 +599,10 @@ static int partitions_probe(blkid_probe

 			continue;

 		/* apply checks from idinfo */

-		if (idinfo_probe(pr, idinfos[i], chn) != 0)

+		rc = idinfo_probe(pr, idinfos[i], chn);

+		if (rc < 0)

+			break;

+		if (rc != BLKID_PROBE_OK)

 			continue;

 		name = idinfos[i]->name;

@@ -613,20 +618,21 @@ static int partitions_probe(blkid_probe

 		break;

 	}

-	if (rc == 1) {

-		DBG(LOWPROBE, blkid_debug("<-- leaving probing loop (failed) [PARTS idx=%d]",

-			chn->idx));

+	if (rc != BLKID_PROBE_OK) {

+		DBG(LOWPROBE, blkid_debug("<-- leaving probing loop (failed=%d) [PARTS idx=%d]",

+			rc, chn->idx));

 	}

 details_only:

 	/*

 	 * Gather PART_ENTRY_* values if the current device is a partition.

 	 */

-	if (!chn->binary &&

+	if ((rc == BLKID_PROBE_OK || rc == BLKID_PROBE_NONE) && !chn->binary &&

 	    (blkid_partitions_get_flags(pr) & BLKID_PARTS_ENTRY_DETAILS)) {

-		if (!blkid_partitions_probe_partition(pr))

-			rc = 0;

+		int xrc = blkid_partitions_probe_partition(pr);

+		if (xrc < 0)

+			rc = xrc;	/* optional, care about errors only */

 	}

 	return rc;

@@ -637,7 +643,7 @@ int blkid_partitions_do_subprobe(blkid_p

 		const struct blkid_idinfo *id)

 {

 	blkid_probe prc;

-	int rc = 1;

+	int rc;

 	blkid_partlist ls;

 	blkid_loff_t sz, off;

@@ -646,7 +652,7 @@ int blkid_partitions_do_subprobe(blkid_p

 		id->name, parent));

 	if (!pr || !parent || !parent->size)

-		return -1;

+		return -EINVAL;

 	/* range defined by parent */

 	sz = ((blkid_loff_t) parent->size) << 9;

@@ -656,13 +662,13 @@ int blkid_partitions_do_subprobe(blkid_p

 		DBG(LOWPROBE, blkid_debug(

 			"ERROR: parts: <---- '%s' subprobe: overflow detected.",

 			id->name));

-		return -1;

+		return -ENOSPC;

 	}

 	/* create private prober */

 	prc = blkid_clone_probe(pr);

 	if (!prc)

-		return -1;

+		return -ENOMEM;

 	blkid_probe_set_dimension(prc, off, sz);

@@ -695,7 +701,7 @@ int blkid_partitions_do_subprobe(blkid_p

 static int blkid_partitions_probe_partition(blkid_probe pr)

 {

-	int rc = 1;

+	int rc = BLKID_PROBE_NONE;

 	blkid_probe disk_pr = NULL;

 	blkid_partlist ls;

 	blkid_partition par;

@@ -761,7 +767,7 @@ static int blkid_partitions_probe_partit

 		blkid_probe_sprintf_value(pr, "PART_ENTRY_DISK", "%u:%u",

 				major(disk), minor(disk));

 	}

-	rc = 0;

+	rc = BLKID_PROBE_OK;

 nothing:

 	return rc;

 }

diff -up util-linux-2.23.2/libblkid/src/partitions/sgi.c.kzak util-linux-2.23.2/libblkid/src/partitions/sgi.c

--- util-linux-2.23.2/libblkid/src/partitions/sgi.c.kzak	2013-07-15 10:25:46.285049072 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/sgi.c	2014-03-28 15:11:44.677551986 +0100

@@ -99,8 +99,11 @@ static int probe_sgi_pt(blkid_probe pr,

 	int i;

 	l = (struct sgi_disklabel *) blkid_probe_get_sector(pr, 0);

-	if (!l)

+	if (!l) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	if (count_checksum(l)) {

 		DBG(LOWPROBE, blkid_debug(

@@ -110,11 +113,11 @@ static int probe_sgi_pt(blkid_probe pr,

 	if (blkid_partitions_need_typeonly(pr))

 		/* caller does not ask for details about partitions */

-		return 0;

+		return BLKID_PROBE_OK;

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	tab = blkid_partlist_new_parttable(ls, "sgi", 0);

 	if (!tab)

@@ -138,12 +141,12 @@ static int probe_sgi_pt(blkid_probe pr,

 		blkid_partition_set_type(par, type);

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

 err:

-	return -1;

+	return -ENOMEM;

 }

 const struct blkid_idinfo sgi_pt_idinfo =

diff -up util-linux-2.23.2/libblkid/src/partitions/solaris_x86.c.kzak util-linux-2.23.2/libblkid/src/partitions/solaris_x86.c

--- util-linux-2.23.2/libblkid/src/partitions/solaris_x86.c.kzak	2013-06-13 09:46:10.418650605 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/solaris_x86.c	2014-03-28 15:11:44.677551986 +0100

@@ -69,8 +69,11 @@ static int probe_solaris_pt(blkid_probe

 	uint16_t nparts;

 	l = (struct solaris_vtoc *) blkid_probe_get_sector(pr, SOLARIS_SECTOR);

-	if (!l)

+	if (!l) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	if (le32_to_cpu(l->v_version) != 1) {

 		DBG(LOWPROBE, blkid_debug(

@@ -81,11 +84,11 @@ static int probe_solaris_pt(blkid_probe

 	if (blkid_partitions_need_typeonly(pr))

 		/* caller does not ask for details about partitions */

-		return 0;

+		return BLKID_PROBE_OK;

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	parent = blkid_partlist_get_parent(ls);

@@ -126,12 +129,12 @@ static int probe_solaris_pt(blkid_probe

 		blkid_partition_set_flags(par, le16_to_cpu(p->s_flag));

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

 err:

-	return -1;

+	return -ENOMEM;

 }

 const struct blkid_idinfo solaris_x86_pt_idinfo =

diff -up util-linux-2.23.2/libblkid/src/partitions/sun.c.kzak util-linux-2.23.2/libblkid/src/partitions/sun.c

--- util-linux-2.23.2/libblkid/src/partitions/sun.c.kzak	2013-06-13 09:46:10.419650613 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/sun.c	2014-03-28 15:11:44.678551996 +0100

@@ -27,8 +27,11 @@ static int probe_sun_pt(blkid_probe pr,

 	int i, use_vtoc;

 	l = (struct sun_disklabel *) blkid_probe_get_sector(pr, 0);

-	if (!l)

+	if (!l) {

+		if (errno)

+			return -errno;

 		goto nothing;

+	}

 	if (sun_pt_checksum(l)) {

 		DBG(LOWPROBE, blkid_debug(

@@ -38,11 +41,11 @@ static int probe_sun_pt(blkid_probe pr,

 	if (blkid_partitions_need_typeonly(pr))

 		/* caller does not ask for details about partitions */

-		return 0;

+		return BLKID_PROBE_OK;

 	ls = blkid_probe_get_partlist(pr);

 	if (!ls)

-		goto err;

+		goto nothing;

 	tab = blkid_partlist_new_parttable(ls, "sun", 0);

 	if (!tab)

@@ -76,7 +79,7 @@ static int probe_sun_pt(blkid_probe pr,

 		uint16_t type = 0, flags = 0;

 		blkid_partition par;

-                start = be32_to_cpu(p->start_cylinder) * spc;

+		start = be32_to_cpu(p->start_cylinder) * spc;

 		size = be32_to_cpu(p->num_sectors);

 		if (use_vtoc) {

 			type = be16_to_cpu(l->vtoc.infos[i].id);

@@ -96,12 +99,12 @@ static int probe_sun_pt(blkid_probe pr,

 		if (flags)

 			blkid_partition_set_flags(par, flags);

 	}

-	return 0;

+	return BLKID_PROBE_OK;

 nothing:

-	return 1;

+	return BLKID_PROBE_NONE;

 err:

-	return -1;

+	return -ENOMEM;

 }

diff -up util-linux-2.23.2/libblkid/src/partitions/ultrix.c.kzak util-linux-2.23.2/libblkid/src/partitions/ultrix.c

--- util-linux-2.23.2/libblkid/src/partitions/ultrix.c.kzak	2013-05-30 15:21:43.127591380 +0200

+++ util-linux-2.23.2/libblkid/src/partitions/ultrix.c	2014-03-28 15:11:44.678551996 +0100

@@ -44,8 +44,11 @@ static int probe_ultrix_pt(blkid_probe p

 	int i;

 	data = blkid_probe_get_sector(pr, ULTRIX_SECTOR);

-	if (!data)

+	if (!data) {

+		if (errno)

+			return -errno;

 		goto nothing;