]> sourceware.org Git - lvm2.git/commitdiff
spaces->tabs
authorAlasdair Kergon <agk@redhat.com>
Fri, 19 Aug 2011 17:02:48 +0000 (17:02 +0000)
committerAlasdair Kergon <agk@redhat.com>
Fri, 19 Aug 2011 17:02:48 +0000 (17:02 +0000)
libdm/ioctl/libdm-iface.c
libdm/libdm-deptree.c

index 800b5ccdd57734c626b183b11d68151b7eb3ef2e..816f1e64589cf56fc67c036c6618c4894688c742 100644 (file)
@@ -542,8 +542,8 @@ int dm_check_version(void)
 int dm_cookie_supported(void)
 {
        return (dm_check_version() &&
-               _dm_version >= 4 &&
-               _dm_version_minor >= 15);
+               _dm_version >= 4 &&
+               _dm_version_minor >= 15);
 }
 
 static int dm_inactive_supported(void)
@@ -647,12 +647,12 @@ int dm_task_get_info(struct dm_task *dmt, struct dm_info *info)
 }
 
 uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, uint32_t *read_ahead)
-{              
+{
        const char *dev_name;
 
        *read_ahead = 0;
 
-        if (!dmt->dmi.v4 || !(dmt->dmi.v4->flags & DM_EXISTS_FLAG))
+       if (!dmt->dmi.v4 || !(dmt->dmi.v4->flags & DM_EXISTS_FLAG))
                return 0;
 
        if (*dmt->dmi.v4->name)
@@ -1336,7 +1336,7 @@ static int _create_and_load_v4(struct dm_task *dmt)
                if (!dm_task_set_cookie(dmt, &cookie,
                                        (dmt->event_nr & DM_UDEV_FLAGS_MASK) >>
                                        DM_UDEV_FLAGS_SHIFT))
-                        stack; /* keep going */
+                       stack; /* keep going */
        }
 
        if (!dm_task_run(dmt))
@@ -1492,8 +1492,8 @@ static int _check_children_not_suspended_v4(struct dm_task *dmt, uint64_t device
                goto out;
        }
 
-        if (!(deps = dm_task_get_deps(task)))
-                goto out;
+       if (!(deps = dm_task_get_deps(task)))
+               goto out;
 
        for (i = 0; i < deps->count; i++) {
                /* Only recurse with dm devices */
@@ -1707,15 +1707,15 @@ int dm_task_run(struct dm_task *dmt)
                          "are known to be suspended: "
                          "%s%s%s %s%.0d%s%.0d%s%s",
                          suspended_counter,
-                         dmt->dev_name ? : "",
-                         dmt->uuid ? " UUID " : "",
+                         dmt->dev_name ? : "",
+                         dmt->uuid ? " UUID " : "",
                          dmt->uuid ? : "",
-                         dmt->major > 0 ? "(" : "",
-                         dmt->major > 0 ? dmt->major : 0,
-                         dmt->major > 0 ? ":" : "",
-                         dmt->minor > 0 ? dmt->minor : 0,
-                         dmt->major > 0 && dmt->minor == 0 ? "0" : "",
-                         dmt->major > 0 ? ") " : "");
+                         dmt->major > 0 ? "(" : "",
+                         dmt->major > 0 ? dmt->major : 0,
+                         dmt->major > 0 ? ":" : "",
+                         dmt->minor > 0 ? dmt->minor : 0,
+                         dmt->major > 0 && dmt->minor == 0 ? "0" : "",
+                         dmt->major > 0 ? ") " : "");
 
        /* FIXME Detect and warn if cookie set but should not be. */
 repeat_ioctl:
index 66508b3d96dc37df45e99be9fad3725245534ba6..5439f7acead988895b31d4805831af97618fcb21 100644 (file)
@@ -150,7 +150,7 @@ struct load_segment {
        struct dm_tree_node *replicator;/* Replicator-dev */
        uint64_t rdevice_index;         /* Replicator-dev */
 
-       uint64_t rebuilds;              /* raid */
+       uint64_t rebuilds;            /* raid */
 };
 
 /* Per-device properties */
@@ -194,12 +194,12 @@ struct dm_tree_link {
 struct dm_tree_node {
        struct dm_tree *dtree;
 
-        const char *name;
-        const char *uuid;
-        struct dm_info info;
+       const char *name;
+       const char *uuid;
+       struct dm_info info;
 
-        struct dm_list uses;           /* Nodes this node uses */
-        struct dm_list used_by;        /* Nodes that use this node */
+       struct dm_list uses;            /* Nodes this node uses */
+       struct dm_list used_by;         /* Nodes that use this node */
 
        int activation_priority;        /* 0 gets activated first */
 
@@ -1038,7 +1038,7 @@ static int _rename_node(const char *old_name, const char *new_name, uint32_t maj
        }
 
        if (!dm_task_set_newname(dmt, new_name))
-                goto_out;
+               goto_out;
 
        if (!dm_task_no_open_count(dmt))
                log_error("Failed to disable open_count");
@@ -1450,10 +1450,10 @@ out:
 static int _build_dev_string(char *devbuf, size_t bufsize, struct dm_tree_node *node)
 {
        if (!dm_format_dev(devbuf, bufsize, node->info.major, node->info.minor)) {
-                log_error("Failed to format %s device number for %s as dm "
-                          "target (%u,%u)",
-                          node->name, node->uuid, node->info.major, node->info.minor);
-                return 0;
+               log_error("Failed to format %s device number for %s as dm "
+                         "target (%u,%u)",
+                         node->name, node->uuid, node->info.major, node->info.minor);
+               return 0;
        }
 
        return 1;
@@ -2132,8 +2132,8 @@ static struct load_segment *_add_segment(struct dm_tree_node *dnode, unsigned ty
 }
 
 int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode,
-                                               uint64_t size,
-                                               const char *origin_uuid)
+                                              uint64_t size,
+                                              const char *origin_uuid)
 {
        struct load_segment *seg;
        struct dm_tree_node *origin_node;
@@ -2238,7 +2238,7 @@ int dm_tree_node_add_snapshot_merge_target(struct dm_tree_node *node,
 }
 
 int dm_tree_node_add_error_target(struct dm_tree_node *node,
-                                     uint64_t size)
+                                    uint64_t size)
 {
        if (!_add_segment(node, SEG_ERROR, size))
                return_0;
@@ -2247,7 +2247,7 @@ int dm_tree_node_add_error_target(struct dm_tree_node *node,
 }
 
 int dm_tree_node_add_zero_target(struct dm_tree_node *node,
-                                    uint64_t size)
+                                   uint64_t size)
 {
        if (!_add_segment(node, SEG_ZERO, size))
                return_0;
@@ -2256,7 +2256,7 @@ int dm_tree_node_add_zero_target(struct dm_tree_node *node,
 }
 
 int dm_tree_node_add_linear_target(struct dm_tree_node *node,
-                                      uint64_t size)
+                                     uint64_t size)
 {
        if (!_add_segment(node, SEG_LINEAR, size))
                return_0;
@@ -2265,8 +2265,8 @@ int dm_tree_node_add_linear_target(struct dm_tree_node *node,
 }
 
 int dm_tree_node_add_striped_target(struct dm_tree_node *node,
-                                       uint64_t size,
-                                       uint32_t stripe_size)
+                                      uint64_t size,
+                                      uint32_t stripe_size)
 {
        struct load_segment *seg;
 
@@ -2353,7 +2353,7 @@ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node,
 }
 
 int dm_tree_node_add_mirror_target(struct dm_tree_node *node,
-                                      uint64_t size)
+                                     uint64_t size)
 {
        if (!_add_segment(node, SEG_MIRRORED, size))
                return_0;
@@ -2573,9 +2573,9 @@ static int _add_area(struct dm_tree_node *node, struct load_segment *seg, struct
 }
 
 int dm_tree_node_add_target_area(struct dm_tree_node *node,
-                                    const char *dev_name,
-                                    const char *uuid,
-                                    uint64_t offset)
+                                   const char *dev_name,
+                                   const char *uuid,
+                                   uint64_t offset)
 {
        struct load_segment *seg;
        struct stat info;
@@ -2599,7 +2599,7 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node,
                        return 0;
                }
 
-               if (!S_ISBLK(info.st_mode)) {
+               if (!S_ISBLK(info.st_mode)) {
                        log_error("Device %s is not a block device.", dev_name);
                        return 0;
                }
This page took 0.046166 seconds and 5 git commands to generate.