commit 3ac906f771c42363dc05e0a393defd21a57d3790
author Markus Armbruster <armbru@redhat.com> Thu Jul 01 09:30:38 2010 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Jul 02 13:18:02 2010 +0200
tree 16ba492fb5c6340b1c10c19c88dc8c7862991764
parent f9092b108f7b35e463e58bd3dd348ff002ba9e63

block: Clean up bdrv_snapshots()

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index feda755..003d132 100644
--- a/block.c
+++ b/block.c
@@ -1789,19 +1789,18 @@
 {
     BlockDriverState *bs;
 
-    if (bs_snapshots)
+    if (bs_snapshots) {
         return bs_snapshots;
+    }
 
     bs = NULL;
     while ((bs = bdrv_next(bs))) {
         if (bdrv_can_snapshot(bs)) {
-            goto ok;
+            bs_snapshots = bs;
+            return bs;
         }
     }
     return NULL;
- ok:
-    bs_snapshots = bs;
-    return bs;
 }
 
 int bdrv_snapshot_create(BlockDriverState *bs,