[lvm-devel] master - cleanup: easier code

Zdenek Kabelac zkabelac at sourceware.org
Fri Mar 10 18:37:41 UTC 2017


Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d11b8eef893b9bd05b2e923f8637e527df16ac01
Commit:        d11b8eef893b9bd05b2e923f8637e527df16ac01
Parent:        52935b5834b6592acab1e68df18b9779de54033f
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Wed Mar 8 14:28:28 2017 +0100
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Fri Mar 10 19:33:01 2017 +0100

cleanup: easier code

---
 lib/metadata/thin_manip.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index ce5b95c..d1259b4 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -781,20 +781,16 @@ int lv_is_thin_origin(const struct logical_volume *lv, unsigned int *snap_count)
 	if (snap_count)
 		*snap_count = 0;
 
-	if (!lv_is_thin_volume(lv) ||
-	    dm_list_empty(&lv->segs_using_this_lv))
-		return 0;
+	if (lv_is_thin_volume(lv))
+		dm_list_iterate_items(segl, &lv->segs_using_this_lv)
+			if (segl->seg->origin == lv) {
+				r = 1;
+
+				if (!snap_count)
+					break;/* not interested in number of snapshots */
 
-	dm_list_iterate_items(segl, &lv->segs_using_this_lv) {
-		if (segl->seg->origin == lv) {
-			r = 1;
-			if (snap_count)
 				(*snap_count)++;
-			else
-				/* not interested in number of snapshots */
-				break;
-		}
-	}
+			}
 
 	return r;
 }




More information about the lvm-devel mailing list