diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2021-08-18 21:11:03 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2021-08-18 21:11:03 +0000 |
| commit | c7cf100aafb4cb881e05a5153de152907f6c07f3 (patch) | |
| tree | 9be13a4212b766ec5944e1cbbfe2c6e8c9af24d1 /lib | |
| parent | c261b6ea4e2ef1fc6a446443ee594ad76f392350 (diff) | |
| download | src-c7cf100aafb4cb881e05a5153de152907f6c07f3.tar.gz src-c7cf100aafb4cb881e05a5153de152907f6c07f3.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/geom/eli/geom_eli.c | 8 |
1 files 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. |