From: Stefan Roese <sr@denx.de>
Date: Fri, 26 Oct 2012 04:24:01 +0000 (+0000)
Subject: ZFS: Fix compile warning in fs/zfs/zfs.c (GCC 4.6.4 from ELDK 5.2.1)
X-Git-Tag: v2013.01-rc1~54
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e08ebf468784668155fd889b9eaf7868f283fe87;p=oweals%2Fu-boot.git

ZFS: Fix compile warning in fs/zfs/zfs.c (GCC 4.6.4 from ELDK 5.2.1)

This patch fixes the following compile warning:
zfs.c:2006:1: warning: 'zfs_label' defined but not used [-Wunused-function]
zfs.c:2029:1: warning: 'zfs_uuid' defined but not used [-Wunused-function]

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Jorgen Lundman <lundman@lundman.net>
---

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 360f723c84..2db45b1928 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -2002,49 +2002,6 @@ zfs_fetch_nvlist(device_t dev, char **nvlist)
 	return err;
 }
 
-static int
-zfs_label(device_t device, char **label)
-{
-	char *nvlist;
-	int err;
-	struct zfs_data *data;
-
-	data = zfs_mount(device);
-	if (!data)
-		return ZFS_ERR_BAD_FS;
-
-	err = int_zfs_fetch_nvlist(data, &nvlist);
-	if (err) {
-		zfs_unmount(data);
-		return err;
-	}
-
-	*label = zfs_nvlist_lookup_string(nvlist, ZPOOL_CONFIG_POOL_NAME);
-	free(nvlist);
-	zfs_unmount(data);
-	return ZFS_ERR_NONE;
-}
-
-static int
-zfs_uuid(device_t device, char **uuid)
-{
-	struct zfs_data *data;
-
-	data = zfs_mount(device);
-	if (!data)
-		return ZFS_ERR_BAD_FS;
-
-	*uuid = malloc(17); /* %016llx + nil */
-	if (!*uuid)
-		return ZFS_ERR_OUT_OF_MEMORY;
-
-	/* *uuid = xasprintf ("%016llx", (long long unsigned) data->pool_guid);*/
-	snprintf(*uuid, 17, "%016llx", (long long unsigned) data->pool_guid);
-	zfs_unmount(data);
-
-	return ZFS_ERR_NONE;
-}
-
 /*
  * zfs_open() locates a file in the rootpool by following the
  * MOS and places the dnode of the file in the memory address DNODE.
@@ -2325,14 +2282,6 @@ zfs_ls(device_t device, const char *path,
 	struct zfs_data *data;
 	int err;
 	int isfs;
-#if 0
-	char *label = NULL;
-
-	zfs_label(device, &label);
-	if (label)
-		printf("ZPOOL label '%s'\n",
-			   label);
-#endif
 
 	data = zfs_mount(device);
 	if (!data)