ceph-daemon: fix fsid inference

All return paths should return func.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 36a8989e1ccdc0e2cd765c7bf611197c5e757d34..f9e27179a322deb9fdee0df07019eeaeaf0bbfa1 100755 (executable)
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -235,7 +235,7 @@ def infer_fsid(func):
     def _infer_fsid():
         if args.fsid:
             logger.debug('Using specified fsid: %s' % args.fsid)
-            return
+            return func()
 
         fsid_list = []
         for i in os.listdir(args.data_dir):
@@ -246,7 +246,7 @@ def infer_fsid(func):
 
         if not fsid_list:
             # TODO: raise?
-            return
+            return func()
 
         if len(fsid_list) > 1:
             raise RuntimeError('Cannot infer fsid, must specify --fsid')