]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd.py: fix pep8 E128 under-indented lines
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Sun, 1 Mar 2015 20:52:20 +0000 (21:52 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 3 Mar 2015 11:59:30 +0000 (12:59 +0100)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/pybind/rbd.py

index 7e0dd4a4382243e8b2d295b349d2eab8daf6ccfa..5350dfb34d8e9a0fc53fde6b1f768df90af0dcbd 100644 (file)
@@ -489,7 +489,8 @@ class Image(object):
             name = create_string_buffer(size)
             snapname = create_string_buffer(size)
             ret = self.librbd.rbd_get_parent_info(self.image, pool, len(pool),
-                name, len(name), snapname, len(snapname))
+                                                  name, len(name), snapname,
+                                                  len(snapname))
             if ret == -errno.ERANGE:
                 size *= 2
 
@@ -719,14 +720,16 @@ class Image(object):
         :raises: :class:`InvalidArgument`, :class:`IOError`
         """
         ret_buf = create_string_buffer(length)
-       if fadvise_flags == 0:
-         ret = self.librbd.rbd_read(self.image, c_uint64(offset),
-                                     c_size_t(length), byref(ret_buf))
-       else:
-         ret = self.librbd.rbd_read2(self.image, c_uint64(offset),
-                                       c_size_t(length), byref(ret_buf), c_int(fadvise_flags))
+        if fadvise_flags == 0:
+            ret = self.librbd.rbd_read(self.image, c_uint64(offset),
+                                       c_size_t(length), byref(ret_buf))
+        else:
+            ret = self.librbd.rbd_read2(self.image, c_uint64(offset),
+                                        c_size_t(length), byref(ret_buf),
+                                        c_int(fadvise_flags))
         if ret < 0:
             raise make_ex(ret, 'error reading %s %ld~%ld' % (self.image, offset, length))
+
         return ctypes.string_at(ret_buf, ret)
 
     def diff_iterate(self, offset, length, from_snapshot, iterate_cb):
@@ -799,12 +802,14 @@ class Image(object):
         if not isinstance(data, str):
             raise TypeError('data must be a string')
         length = len(data)
-       if fadvise_flags == 0:
-         ret = self.librbd.rbd_write(self.image, c_uint64(offset),
-                                     c_size_t(length), c_char_p(data))
-       else:
-         ret = self.librbd.rbd_write2(self.image, c_uint64(offset),
-                                     c_size_t(length), c_char_p(data), c_int(fadvise_flags))
+
+        if fadvise_flags == 0:
+            ret = self.librbd.rbd_write(self.image, c_uint64(offset),
+                                        c_size_t(length), c_char_p(data))
+        else:
+            ret = self.librbd.rbd_write2(self.image, c_uint64(offset),
+                                         c_size_t(length), c_char_p(data),
+                                         c_int(fadvise_flags))
 
         if ret == length:
             return ret