git: c7cf100aafb4 - main - geli(8): Do not report error on resize to the same size.

Alexander Motin mav at FreeBSD.org
Wed Aug 18 21:21:01 UTC 2021


The branch main has been updated by mav:

URL: https://cgit.FreeBSD.org/src/commit/?id=c7cf100aafb4cb881e05a5153de152907f6c07f3

commit c7cf100aafb4cb881e05a5153de152907f6c07f3
Author:     Alexander Motin <mav at FreeBSD.org>
AuthorDate: 2021-08-18 21:11:03 +0000
Commit:     Alexander Motin <mav at FreeBSD.org>
CommitDate: 2021-08-18 21:11:03 +0000

    geli(8): Do not report error on resize to the same size.
    
    Just validate the old metadata and exit.  Originally the check was
    added to not thash the only copy of metadata, but we can achieve the
    same just by skipping the writing/trashing.  The metadata validation
    should protect user from wrongly specifying new size instead of old.
    
    MFC after:      1 month
    Sponsored by:   iXsystems, Inc.
---
 lib/geom/eli/geom_eli.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c
index 8ee4643e3c91..4c04a9256b5e 100644
--- a/lib/geom/eli/geom_eli.c
+++ b/lib/geom/eli/geom_eli.c
@@ -1823,10 +1823,6 @@ eli_resize(struct gctl_req *req)
 		gctl_error(req, "Invalid oldsize: Out of range.");
 		goto out;
 	}
-	if (oldsize == mediasize) {
-		gctl_error(req, "Size hasn't changed.");
-		goto out;
-	}
 
 	/* Read metadata from the 'oldsize' offset. */
 	if (pread(provfd, sector, secsize, oldsize - secsize) != secsize) {
@@ -1865,6 +1861,10 @@ eli_resize(struct gctl_req *req)
 		goto out;
 	}
 
+	/* The metadata is valid and nothing has changed.  Just exit. */
+	if (oldsize == mediasize)
+		goto out;
+
 	/*
 	 * Update the old metadata with the current provider size and write
 	 * it back to the correct place on the provider.


More information about the dev-commits-src-all mailing list