[lvm-devel] master - cleanup: reorder code

Zdenek Kabelac zkabelac at fedoraproject.org
Fri Jul 11 11:34:37 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9955204e0d9d8d50c19564d475ece03995a6e837
Commit:        9955204e0d9d8d50c19564d475ece03995a6e837
Parent:        de1ee0bc52255987f3b21819a55c0ef9ddf261bb
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Mon Jul 7 22:24:35 2014 +0200
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Fri Jul 11 13:32:21 2014 +0200

cleanup: reorder code

Simplify code.
---
 lib/metadata/thin_manip.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index 33ab31c..28b6bbf 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -474,15 +474,15 @@ int update_thin_pool_params(struct volume_group *vg, unsigned attr,
 	}
 
 	if (*pool_metadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) {
+		*pool_metadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE;
 		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Maximum supported pool metadata size is %s.",
-				 display_size(cmd, 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE));
-		*pool_metadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE;
+				 display_size(cmd, *pool_metadata_size));
 	} else if (*pool_metadata_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) {
+		*pool_metadata_size = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE;
 		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Minimum supported pool metadata size is %s.",
-				 display_size(cmd, 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE));
-		*pool_metadata_size = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE;
+				 display_size(cmd, *pool_metadata_size));
 	}
 
 	log_verbose("Setting pool metadata size to %s.",




More information about the lvm-devel mailing list