Merge fc2cdfd into a04cbb3

xapi-project · Aug 5, 2015 · aad12be · aad12be
2 parents a04cbb3 + fc2cdfd
commit aad12be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/drivers/EXTSR.py b/drivers/EXTSR.py
@@ -74,8 +74,6 @@ def load(self, sr_uuid):
         self.attached = self._checkmount()
         self.driver_config = DRIVER_CONFIG
 
-        self._check_o_direct()
-
     def delete(self, sr_uuid):
         super(EXTSR, self).delete(sr_uuid)
 

diff --git a/drivers/FileSR.py b/drivers/FileSR.py
@@ -86,6 +86,14 @@ def _check_o_direct(self):
         else:
             self.o_direct = True
 
+
+    def __init__(self, srcmd, sr_uuid):
+        # We call SR.SR.__init__ explicitly because
+        # "super" sometimes failed due to circular imports
+        SR.SR.__init__(self, srcmd, sr_uuid)
+        self._check_o_direct()
+
+
     def load(self, sr_uuid):
         self.ops_exclusive = OPS_EXCLUSIVE
         self.lock = Lock(vhdutil.LOCK_TYPE_SR, self.uuid)
@@ -99,8 +107,6 @@ def load(self, sr_uuid):
         self.attached = False
         self.driver_config = DRIVER_CONFIG
 
-        self._check_o_direct()
-
     def create(self, sr_uuid, size):
         """ Create the SR.  The path must not already exist, or if it does, 
         it must be empty.  (This accounts for the case where the user has

diff --git a/drivers/NFSSR.py b/drivers/NFSSR.py
@@ -93,8 +93,6 @@ def load(self, sr_uuid):
             self.transport = "udp"
         self.nfsversion = nfs.validate_nfsversion(self.dconf.get('nfsversion'))
 
-        self._check_o_direct()
-
 
     def validate_remotepath(self, scan):
         if not self.dconf.has_key('serverpath'):