From: Ben Swartzlander <bswartz@netapp.com>
Date: Wed, 29 Aug 2012 23:10:11 +0000 (-0400)
Subject: Remove unused return values and commented out code from NFS driver
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=198a91a5e447915beca9585546cb92ab956fb0e6;p=openstack-build%2Fcinder-build.git

Remove unused return values and commented out code from NFS driver

bug 1037622

Change-Id: Idea3005ad94fd6bfc76fd0f3969ee78e3031767e
---

diff --git a/cinder/volume/nfs.py b/cinder/volume/nfs.py
index 5ea23674c..ed894efdc 100644
--- a/cinder/volume/nfs.py
+++ b/cinder/volume/nfs.py
@@ -107,7 +107,7 @@ class NfsDriver(driver.VolumeDriver):
         if not volume['provider_location']:
             LOG.warn(_('Volume %s does not have provider_location specified, '
                      'skipping'), volume['name'])
-            return True
+            return
 
         self._ensure_share_mounted(volume['provider_location'])
 
@@ -118,10 +118,8 @@ class NfsDriver(driver.VolumeDriver):
 
             LOG.warn(_('Trying to delete non-existing volume %(volume)s at '
                      'path %(mounted_path)s') % locals())
-            return True
+            return
 
-#        self._execute('dd', 'if=/dev/zero', 'of=%s' % mounted_volume_path,
-#                      'bs=1M', run_as_root=True)
         self._execute('rm', '-f', mounted_path, run_as_root=True)
 
     def ensure_export(self, ctx, volume):