From de8d05dffa5d0a862bbda56b19eaa60c4c5d48a0 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 1 Jul 2020 16:10:10 -0400
Subject: [PATCH] Remove unneeded arg from _clean_db (vol manager)

The context arg is not used by this method.

Change-Id: Ie6dbec8b1a69c2180ac4f3812678d4837b4aac47
---
 cinder/volume/manager.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 0c8c4aa3da3..23b6d3730fa 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -882,7 +882,7 @@ class VolumeManager(manager.CleanableManager,
                                                                     volume.id)
                 for s in snapshots:
                     if s.status != fields.SnapshotStatus.DELETING:
-                        self._clear_db(context, is_migrating_dest, volume,
+                        self._clear_db(is_migrating_dest, volume,
                                        'error_deleting')
 
                         msg = (_("Snapshot %(id)s was found in state "
@@ -902,8 +902,7 @@ class VolumeManager(manager.CleanableManager,
                       resource=volume)
             # If this is a destination volume, we have to clear the database
             # record to avoid user confusion.
-            self._clear_db(context, is_migrating_dest, volume,
-                           'available')
+            self._clear_db(is_migrating_dest, volume, 'available')
             return
         except Exception:
             with excutils.save_and_reraise_exception():
@@ -913,8 +912,7 @@ class VolumeManager(manager.CleanableManager,
                 if unmanage_only is True:
                     new_status = 'error_unmanaging'
 
-                self._clear_db(context, is_migrating_dest, volume,
-                               new_status)
+                self._clear_db(is_migrating_dest, volume, new_status)
 
         # If deleting source/destination volume in a migration or a temp
         # volume for backup, we should skip quotas.
@@ -958,7 +956,7 @@ class VolumeManager(manager.CleanableManager,
             msg = "Unmanaged volume successfully."
         LOG.info(msg, resource=volume)
 
-    def _clear_db(self, context, is_migrating_dest, volume_ref, status):
+    def _clear_db(self, is_migrating_dest, volume_ref, status):
         # This method is called when driver.unmanage() or
         # driver.delete_volume() fails in delete_volume(), so it is already
         # in the exception handling part.