dm: fix undue/missing spaces
authorHeinz Mauelshagen <heinzm@redhat.com>
Mon, 30 Jan 2023 20:43:57 +0000 (21:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Jul 2023 14:22:07 +0000 (16:22 +0200)
[ Upstream commit 43be9c743c2553519c2093d1798b542f28095a51 ]

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Stable-dep-of: 249bed821b4d ("dm ioctl: Avoid double-fetch of version")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/dm-ioctl.c
drivers/md/dm-mpath.c
drivers/md/dm-ps-service-time.c
drivers/md/dm-snap.c
drivers/md/dm-table.c
drivers/md/dm-uevent.h
drivers/md/dm-writecache.c
drivers/md/dm-zoned-metadata.c

index 6ae1c19..9fc4a5d 100644 (file)
@@ -1572,7 +1572,7 @@ static void retrieve_deps(struct dm_table *table,
        /*
         * Count the devices.
         */
-       list_for_each (tmp, dm_table_get_devices(table))
+       list_for_each(tmp, dm_table_get_devices(table))
                count++;
 
        /*
@@ -1589,7 +1589,7 @@ static void retrieve_deps(struct dm_table *table,
         */
        deps->count = count;
        count = 0;
-       list_for_each_entry (dd, dm_table_get_devices(table), list)
+       list_for_each_entry(dd, dm_table_get_devices(table), list)
                deps->dev[count++] = huge_encode_dev(dd->dm_dev->bdev->bd_dev);
 
        param->data_size = param->data_start + needed;
index 91c25ad..66032ab 100644 (file)
@@ -1086,7 +1086,7 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
                        goto fail;
                }
                j = sprintf(p, "%d", hw_argc - 1);
-               for (i = 0, p+=j+1; i <= hw_argc - 2; i++, p+=j+1)
+               for (i = 0, p += j + 1; i <= hw_argc - 2; i++, p += j + 1)
                        j = sprintf(p, "%s", as->argv[i]);
        }
        dm_consume_args(as, hw_argc - 1);
index 84d2623..eba2293 100644 (file)
@@ -127,8 +127,7 @@ static int st_add_path(struct path_selector *ps, struct dm_path *path,
         *                      The valid range: 0-<ST_MAX_RELATIVE_THROUGHPUT>
         *                      If not given, minimum value '1' is used.
         *                      If '0' is given, the path isn't selected while
-        *                      other paths having a positive value are
-        *                      available.
+        *                      other paths having a positive value are available.
         */
        if (argc > 2) {
                *error = "service-time ps: incorrect number of arguments";
index c64d987..cb80d03 100644 (file)
@@ -388,7 +388,7 @@ static struct origin *__lookup_origin(struct block_device *origin)
        struct origin *o;
 
        ol = &_origins[origin_hash(origin)];
-       list_for_each_entry (o, ol, hash_list)
+       list_for_each_entry(o, ol, hash_list)
                if (bdev_equal(o->bdev, origin))
                        return o;
 
@@ -407,7 +407,7 @@ static struct dm_origin *__lookup_dm_origin(struct block_device *origin)
        struct dm_origin *o;
 
        ol = &_dm_origins[origin_hash(origin)];
-       list_for_each_entry (o, ol, hash_list)
+       list_for_each_entry(o, ol, hash_list)
                if (bdev_equal(o->dev->bdev, origin))
                        return o;
 
@@ -2446,7 +2446,7 @@ static int __origin_write(struct list_head *snapshots, sector_t sector,
        chunk_t chunk;
 
        /* Do all the snapshots on this origin */
-       list_for_each_entry (snap, snapshots, list) {
+       list_for_each_entry(snap, snapshots, list) {
                /*
                 * Don't make new exceptions in a merging snapshot
                 * because it has effectively been deleted
index 3acded2..337e667 100644 (file)
@@ -211,7 +211,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
 {
        struct dm_dev_internal *dd;
 
-       list_for_each_entry (dd, l, list)
+       list_for_each_entry(dd, l, list)
                if (dd->dm_dev->bdev->bd_dev == dev)
                        return dd;
 
index 2c9ba56..12a5d4f 100644 (file)
@@ -3,7 +3,7 @@
  * Device Mapper Uevent Support
  *
  * Copyright IBM Corporation, 2007
- *     Author: Mike Anderson <andmike@linux.vnet.ibm.com>
+ *     Author: Mike Anderson <andmike@linux.vnet.ibm.com>
  */
 #ifndef DM_UEVENT_H
 #define DM_UEVENT_H
index 431c845..c6ff43a 100644 (file)
@@ -85,12 +85,12 @@ struct wc_entry {
        unsigned short wc_list_contiguous;
        bool write_in_progress
 #if BITS_PER_LONG == 64
-               :1
+               : 1
 #endif
        ;
        unsigned long index
 #if BITS_PER_LONG == 64
-               :47
+               : 47
 #endif
        ;
        unsigned long age;
index c795ea7..13070c2 100644 (file)
@@ -1013,7 +1013,7 @@ static int dmz_check_sb(struct dmz_metadata *zmd, struct dmz_sb *dsb,
        }
 
        sb_block = le64_to_cpu(sb->sb_block);
-       if (sb_block != (u64)dsb->zone->id << zmd->zone_nr_blocks_shift ) {
+       if (sb_block != (u64)dsb->zone->id << zmd->zone_nr_blocks_shift) {
                dmz_dev_err(dev, "Invalid superblock position "
                            "(is %llu expected %llu)",
                            sb_block,