2015-11-25 12:45:42

by Geliang Tang

Subject: [PATCH] dm-ioctl: fix 4-characters indentations

Change 4-characters indentations to 8-characters.

Signed-off-by: Geliang Tang <[email protected]>
---
drivers/md/dm-ioctl.c | 58 +++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 80a4395..39aae6b 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -45,10 +45,10 @@ struct dm_table {
};

struct vers_iter {
- size_t param_size;
- struct dm_target_versions *vers, *old_vers;
- char *end;
- uint32_t flags;
+ size_t param_size;
+ struct dm_target_versions *vers, *old_vers;
+ char *end;
+ uint32_t flags;
};


@@ -557,36 +557,36 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)

static void list_version_get_needed(struct target_type *tt, void *needed_param)
{
- size_t *needed = needed_param;
+ size_t *needed = needed_param;

- *needed += sizeof(struct dm_target_versions);
- *needed += strlen(tt->name);
- *needed += ALIGN_MASK;
+ *needed += sizeof(struct dm_target_versions);
+ *needed += strlen(tt->name);
+ *needed += ALIGN_MASK;
}

static void list_version_get_info(struct target_type *tt, void *param)
{
- struct vers_iter *info = param;
-
- /* Check space - it might have changed since the first iteration */
- if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 >
- info->end) {
-
- info->flags = DM_BUFFER_FULL_FLAG;
- return;
- }
-
- if (info->old_vers)
- info->old_vers->next = (uint32_t) ((void *)info->vers -
- (void *)info->old_vers);
- info->vers->version[0] = tt->version[0];
- info->vers->version[1] = tt->version[1];
- info->vers->version[2] = tt->version[2];
- info->vers->next = 0;
- strcpy(info->vers->name, tt->name);
-
- info->old_vers = info->vers;
- info->vers = align_ptr(((void *) ++info->vers) + strlen(tt->name) + 1);
+ struct vers_iter *info = param;
+
+ /* Check space - it might have changed since the first iteration */
+ if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 >
+ info->end) {
+
+ info->flags = DM_BUFFER_FULL_FLAG;
+ return;
+ }
+
+ if (info->old_vers)
+ info->old_vers->next = (uint32_t) ((void *)info->vers -
+ (void *)info->old_vers);
+ info->vers->version[0] = tt->version[0];
+ info->vers->version[1] = tt->version[1];
+ info->vers->version[2] = tt->version[2];
+ info->vers->next = 0;
+ strcpy(info->vers->name, tt->name);
+
+ info->old_vers = info->vers;
+ info->vers = align_ptr(((void *) ++info->vers) + strlen(tt->name) + 1);
}

static int list_versions(struct dm_ioctl *param, size_t param_size)
--
2.5.0

2015-11-28 08:38:09

by Minfei Huang

Subject: Re: [dm-devel] [PATCH] dm-ioctl: fix 4-characters indentations

Hi.

IMHO, this sort of defect shouldn't be fixed like this. It should be
fixed with other bugs, if necessary.

Once this patch is applied, it will break up the 'git blame'.

Thanks
Minfei

On 11/25/15 at 08:45pm, Geliang Tang wrote:
> Change 4-characters indentations to 8-characters.
>
> Signed-off-by: Geliang Tang <[email protected]>
> ---
> drivers/md/dm-ioctl.c | 58 +++++++++++++++++++++++++--------------------------
> 1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
> index 80a4395..39aae6b 100644
> --- a/drivers/md/dm-ioctl.c
> +++ b/drivers/md/dm-ioctl.c
> @@ -45,10 +45,10 @@ struct dm_table {
> };
>
> struct vers_iter {
> - size_t param_size;
> - struct dm_target_versions *vers, *old_vers;
> - char *end;
> - uint32_t flags;
> + size_t param_size;
> + struct dm_target_versions *vers, *old_vers;
> + char *end;
> + uint32_t flags;
> };
>
>
> @@ -557,36 +557,36 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)
>
> static void list_version_get_needed(struct target_type *tt, void *needed_param)
> {
> - size_t *needed = needed_param;
> + size_t *needed = needed_param;
>
> - *needed += sizeof(struct dm_target_versions);
> - *needed += strlen(tt->name);
> - *needed += ALIGN_MASK;
> + *needed += sizeof(struct dm_target_versions);
> + *needed += strlen(tt->name);
> + *needed += ALIGN_MASK;
> }
>
> static void list_version_get_info(struct target_type *tt, void *param)
> {
> - struct vers_iter *info = param;
> -
> - /* Check space - it might have changed since the first iteration */
> - if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 >
> - info->end) {
> -
> - info->flags = DM_BUFFER_FULL_FLAG;
> - return;
> - }
> -
> - if (info->old_vers)
> - info->old_vers->next = (uint32_t) ((void *)info->vers -
> - (void *)info->old_vers);
> - info->vers->version[0] = tt->version[0];
> - info->vers->version[1] = tt->version[1];
> - info->vers->version[2] = tt->version[2];
> - info->vers->next = 0;
> - strcpy(info->vers->name, tt->name);
> -
> - info->old_vers = info->vers;
> - info->vers = align_ptr(((void *) ++info->vers) + strlen(tt->name) + 1);
> + struct vers_iter *info = param;
> +
> + /* Check space - it might have changed since the first iteration */
> + if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 >
> + info->end) {
> +
> + info->flags = DM_BUFFER_FULL_FLAG;
> + return;
> + }
> +
> + if (info->old_vers)
> + info->old_vers->next = (uint32_t) ((void *)info->vers -
> + (void *)info->old_vers);
> + info->vers->version[0] = tt->version[0];
> + info->vers->version[1] = tt->version[1];
> + info->vers->version[2] = tt->version[2];
> + info->vers->next = 0;
> + strcpy(info->vers->name, tt->name);
> +
> + info->old_vers = info->vers;
> + info->vers = align_ptr(((void *) ++info->vers) + strlen(tt->name) + 1);
> }
>
> static int list_versions(struct dm_ioctl *param, size_t param_size)
> --
> 2.5.0
>
>
> --
> dm-devel mailing list
> [email protected]
> https://www.redhat.com/mailman/listinfo/dm-devel