Now that the sectorsize and mediasize are properties of the provider,

don't take the detour over the I/O path to discover them using getattr(),
we can just pick them out directly.

Do note though, that for now they are only valid after the first open
of the underlying disk device due compatibility with the old disk_create()
API.  This will change in the future so they will always be valid.

Sponsored by:   DARPA & NAI Labs.

1 files changed, 4 insertions, 12 deletions

diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index 78d496a9bac0..5c9d6ad123cf 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -110,19 +110,11 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
 	while (1) {	/* a trick to allow us to use break */
 		if (gp->rank != 2 && flags == G_TF_NORMAL)
 			break;
-		error = g_getattr("GEOM::sectorsize", cp, &sectorsize);
-		if (error) {
-			sectorsize = 512;
-			printf("g_sunlabel_taste: error %d Sectors are %d bytes\n",
-			    error, sectorsize);
-		}
+		sectorsize = cp->provider->sectorsize;
+		if (sectorsize < 512)
+			break;
 		gsp->frontstuff = 16 * sectorsize;
-		error = g_getattr("GEOM::mediasize", cp, &mediasize);
-		if (error) {
-			mediasize = 0;
-			printf("g_error %d Mediasize is %lld bytes\n",
-			    error, (long long)mediasize);
-		}
+		mediasize = cp->provider->mediasize;
 		buf = g_read_data(cp, 0, sectorsize, &error);
 		if (buf == NULL || error != 0)
 			break;