Merge "Fix LevelDB closing order."

storage/raw/leveldb/leveldb.go

@@ -260,12 +260,6 @@ func NewLevelDBPersistence(o LevelDBOptions) (*LevelDBPersistence, error) {
 func (l *LevelDBPersistence) Close() error {
 	// These are deferred to take advantage of forced closing in case of stack
 	// unwinding due to anomalies.
-	defer func() {
-		if l.storage != nil {
-			l.storage.Close()
-		}
-	}()
-
 	defer func() {
 		if l.filterPolicy != nil {
 			l.filterPolicy.Close()
@@ -296,6 +290,12 @@ func (l *LevelDBPersistence) Close() error {
 		}
 	}()
 
+	defer func() {
+		if l.storage != nil {
+			l.storage.Close()
+		}
+	}()
+
 	return nil
 }