dm: avoid split of quoted strings where possible

[linux-2.6-microblaze.git] / drivers / md / dm-table.c

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index ead5cec..2055a75 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -235,8 +235,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
                return 0;
 
        if ((start >= dev_size) || (start + len > dev_size)) {
-               DMERR("%s: %pg too small for target: "
-                     "start=%llu, len=%llu, dev_size=%llu",
+               DMERR("%s: %pg too small for target: start=%llu, len=%llu, dev_size=%llu",
                      dm_device_name(ti->table->md), bdev,
                      (unsigned long long)start,
                      (unsigned long long)len,
@@ -281,8 +280,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
                return 0;
 
        if (start & (logical_block_size_sectors - 1)) {
-               DMERR("%s: start=%llu not aligned to h/w "
-                     "logical block size %u of %pg",
+               DMERR("%s: start=%llu not aligned to h/w logical block size %u of %pg",
                      dm_device_name(ti->table->md),
                      (unsigned long long)start,
                      limits->logical_block_size, bdev);
@@ -290,8 +288,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
        }
 
        if (len & (logical_block_size_sectors - 1)) {
-               DMERR("%s: len=%llu not aligned to h/w "
-                     "logical block size %u of %pg",
+               DMERR("%s: len=%llu not aligned to h/w logical block size %u of %pg",
                      dm_device_name(ti->table->md),
                      (unsigned long long)len,
                      limits->logical_block_size, bdev);
@@ -884,8 +881,7 @@ static int dm_table_determine_type(struct dm_table *t)
                        bio_based = 1;
 
                if (bio_based && request_based) {
-                       DMERR("Inconsistent table: different target types"
-                             " can't be mixed up");
+                       DMERR("Inconsistent table: different target types can't be mixed up");
                        return -EINVAL;
                }
        }
@@ -1188,8 +1184,7 @@ static int dm_table_register_integrity(struct dm_table *t)
         * profile the new profile should not conflict.
         */
        if (blk_integrity_compare(dm_disk(md), template_disk) < 0) {
-               DMERR("%s: conflict with existing integrity profile: "
-                     "%s profile mismatch",
+               DMERR("%s: conflict with existing integrity profile: %s profile mismatch",
                      dm_device_name(t->md),
                      template_disk->disk_name);
                return 1;
@@ -1711,8 +1706,7 @@ combine_limits:
                 * for the table.
                 */
                if (blk_stack_limits(limits, &ti_limits, 0) < 0)
-                       DMWARN("%s: adding target device "
-                              "(start sect %llu len %llu) "
+                       DMWARN("%s: adding target device (start sect %llu len %llu) "
                               "caused an alignment inconsistency",
                               dm_device_name(t->md),
                               (unsigned long long) ti->begin,