Change in vdsm[master]: mount: Remove unneeded return

[Nir Soffer]

Nir Soffer has uploaded a new change for review.

Change subject: mount: Remove unneeded return
......................................................................

mount: Remove unneeded return

Remove unneeded return in mount._mount() and mount._umount() since
mount._runcmd() does not return any value.

Change-Id: I594c733b9c6230bf225bdc425b2ee58972003600
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
M vdsm/storage/mount.py
M vdsm/supervdsmServer
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/43973/1

diff --git a/vdsm/storage/mount.py b/vdsm/storage/mount.py
index a09199d..1da15c6 100644
--- a/vdsm/storage/mount.py
+++ b/vdsm/storage/mount.py
@@ -217,13 +217,13 @@
 
     def mount(self, mntOpts=None, vfstype=None, timeout=None, cgroup=None):
         mount = supervdsm.getProxy().mount if os.geteuid() != 0 else _mount
-        return mount(self.fs_spec, self.fs_file, mntOpts=mntOpts,
-                     vfstype=vfstype, timeout=timeout, cgroup=cgroup)
+        mount(self.fs_spec, self.fs_file, mntOpts=mntOpts, vfstype=vfstype,
+              timeout=timeout, cgroup=cgroup)
 
     def umount(self, force=False, lazy=False, freeloop=False, timeout=None):
         umount = supervdsm.getProxy().umount if os.geteuid() != 0 else _umount
-        return umount(self.fs_file, force=force, lazy=lazy, freeloop=freeloop,
-                      timeout=timeout)
+        umount(self.fs_file, force=force, lazy=lazy, freeloop=freeloop,
+               timeout=timeout)
 
     def isMounted(self):
         try:
@@ -271,7 +271,7 @@
     if cgroup:
         cmd = cmdutils.systemd_run(cmd, scope=True, slice=cgroup)
 
-    return _runcmd(cmd, timeout)
+    _runcmd(cmd, timeout)
 
 
 def _umount(fs_file, force=False, lazy=False, freeloop=False, timeout=None):
@@ -290,7 +290,7 @@
 
     cmd.append(fs_file)
 
-    return _runcmd(cmd, timeout)
+    _runcmd(cmd, timeout)
 
 
 def _runcmd(cmd, timeout):
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 4b728aa..be3f3b4 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -153,14 +153,14 @@
     @logDecorator
     def mount(self, fs_spec, fs_file, mntOpts=None, vfstype=None, timeout=None,
               cgroup=None):
-        return mount._mount(fs_spec, fs_file, mntOpts=mntOpts, vfstype=vfstype,
-                            timeout=timeout, cgroup=cgroup)
+        mount._mount(fs_spec, fs_file, mntOpts=mntOpts, vfstype=vfstype,
+                     timeout=timeout, cgroup=cgroup)
 
     @logDecorator
     def umount(self, fs_file, force=False, lazy=False, freeloop=False,
                timeout=None):
-        return mount._umount(fs_file, force=force, lazy=lazy,
-                             freeloop=freeloop, timeout=timeout)
+        mount._umount(fs_file, force=force, lazy=lazy, freeloop=freeloop,
+                      timeout=timeout)
 
     @logDecorator
     def resizeMap(self, devName):


-- 
To view, visit https://gerrit.ovirt.org/43973
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I594c733b9c6230bf225bdc425b2ee58972003600
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;