From owner-svn-src-all@freebsd.org Fri Sep 8 15:38:04 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B602E1E638; Fri, 8 Sep 2017 15:38:04 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 150E283E37; Fri, 8 Sep 2017 15:38:04 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88Fc3dk097491; Fri, 8 Sep 2017 15:38:03 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88Fc3re097490; Fri, 8 Sep 2017 15:38:03 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201709081538.v88Fc3re097490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 8 Sep 2017 15:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323315 - head/sbin/geom/class/virstor X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sbin/geom/class/virstor X-SVN-Commit-Revision: 323315 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 15:38:04 -0000 Author: cem Date: Fri Sep 8 15:38:02 2017 New Revision: 323315 URL: https://svnweb.freebsd.org/changeset/base/323315 Log: geom_virstor: Remove wholly unnecessary g_metadata_store copy Just code cleanup. No functional change. Sponsored by: Dell EMC Isilon Modified: head/sbin/geom/class/virstor/geom_virstor.c Modified: head/sbin/geom/class/virstor/geom_virstor.c ============================================================================== --- head/sbin/geom/class/virstor/geom_virstor.c Fri Sep 8 15:08:17 2017 (r323314) +++ head/sbin/geom/class/virstor/geom_virstor.c Fri Sep 8 15:38:02 2017 (r323315) @@ -140,62 +140,6 @@ virstor_main(struct gctl_req *req, unsigned flags) */ } -static void -pathgen(const char *name, char *path, size_t size) -{ - - if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) != 0) - snprintf(path, size, "%s%s", _PATH_DEV, name); - else - strlcpy(path, name, size); -} - -static int -my_g_metadata_store(const char *name, u_char *md, size_t size) -{ - char path[MAXPATHLEN]; - unsigned sectorsize; - off_t mediasize; - u_char *sector; - int error, fd; - - pathgen(name, path, sizeof(path)); - sector = NULL; - error = 0; - - fd = open(path, O_RDWR); - if (fd == -1) - return (errno); - mediasize = g_get_mediasize(name); - if (mediasize == 0) { - error = errno; - goto out; - } - sectorsize = g_get_sectorsize(name); - if (sectorsize == 0) { - error = errno; - goto out; - } - assert(sectorsize >= size); - sector = malloc(sectorsize); - if (sector == NULL) { - error = ENOMEM; - goto out; - } - bcopy(md, sector, size); - bzero(sector + size, sectorsize - size); - if (pwrite(fd, sector, sectorsize, mediasize - sectorsize) != - (ssize_t)sectorsize) { - error = errno; - goto out; - } -out: - if (sector != NULL) - free(sector); - close(fd); - return (error); -} - /* * Labels a new geom Meaning: parses and checks the parameters, calculates & * writes metadata to the relevant providers so when the next round of @@ -465,7 +409,7 @@ virstor_label(struct gctl_req *req) err(1, "Cannot allocate sector of %zu bytes", ssize); bzero(sect, ssize); virstor_metadata_encode(&md, sect); - error = my_g_metadata_store(name, sect, ssize); + error = g_metadata_store(name, sect, ssize); free(sect); if (error != 0) { if (verbose)