Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Oct 2011 07:44:10 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226720 - head/sbin/geom/class/eli
Message-ID:  <201110250744.p9P7iAN9084770@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Tue Oct 25 07:44:10 2011
New Revision: 226720
URL: http://svn.freebsd.org/changeset/base/226720

Log:
  Simplify eli_resize() function.
  
  MFC after:	3 days

Modified:
  head/sbin/geom/class/eli/geom_eli.c

Modified: head/sbin/geom/class/eli/geom_eli.c
==============================================================================
--- head/sbin/geom/class/eli/geom_eli.c	Tue Oct 25 07:37:02 2011	(r226719)
+++ head/sbin/geom/class/eli/geom_eli.c	Tue Oct 25 07:44:10 2011	(r226720)
@@ -1480,18 +1480,12 @@ eli_resize(struct gctl_req *req)
 	 * it back to the correct place on the provider.
 	 */
 	md.md_provsize = mediasize;
-	eli_metadata_encode(&md, sector);
-	if (pwrite(provfd, sector, secsize, mediasize - secsize) != secsize) {
-		gctl_error(req, "Cannot write metadata: %s.", strerror(errno));
-		goto out;
-	}
-	(void)g_flush(provfd);
-
+	/* Write metadata to the provider. */
+	(void)eli_metadata_store(req, prov, &md);
 	/* Now trash the old metadata. */
-	if (eli_trash_metadata(req, prov, provfd, oldsize - secsize) == -1)
-		goto out;
+	(void)eli_trash_metadata(req, prov, provfd, oldsize - secsize);
 out:
-	if (provfd >= 0)
+	if (provfd != -1)
 		(void)g_close(provfd);
 	if (sector != NULL) {
 		bzero(sector, secsize);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110250744.p9P7iAN9084770>