Revert "lvm: non-functional changes"

This reverts commit 7a8d7de2476b61005d80503ab8c816809bbc2d89.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
index 3a1a694e8f0a5a7969f8006b7765397e20392358..4f7750b2540d3b8b12ae17017665c3c1c76bbeba 100644 (file)
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/bdev/lxclvm.c
@@ -47,14 +47,23 @@
 lxc_log_define(lxclvm, lxc);
 
 extern char *dir_new_path(char *src, const char *oldname, const char *name,
-                         const char *oldpath, const char *lxcpath);
-
-/* Path must be '/dev/$vg/$lv', $vg must be an existing VG, and $lv must not yet
- * exist.  This function will attempt to create /dev/$vg/$lv of size $size. If
- * thinpool is specified, we'll check for it's existence and if it's a valid
- * thin pool, and if so, we'll create the requested lv from that thin pool.
- */
-static int do_lvm_create(const char *path, uint64_t size, const char *thinpool)
+               const char *oldpath, const char *lxcpath);
+
+    /*
+     * LVM ops
+     */
+
+    /*
+     * path must be '/dev/$vg/$lv', $vg must be an existing VG, and $lv must not
+     * yet exist.  This function will attempt to create /dev/$vg/$lv of size
+     * $size. If thinpool is specified, we'll check for it's existence and if
+     * it's
+     * a valid thin pool, and if so, we'll create the requested lv from that
+     * thin
+     * pool.
+     */
+    static int do_lvm_create(const char *path, uint64_t size,
+                            const char *thinpool)
 {
        int ret, pid, len;
        char sz[24], *pathdup, *vg, *lv, *tp = NULL;