* [PATCH 1/9] md/dm-table: Use kmalloc_array() in realloc_argv()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
@ 2016-10-01 7:43 ` SF Markus Elfring
2016-10-01 7:44 ` [PATCH 2/9] md/dm-table: Reduce the scope for a variable in dm_table_verify_integrity() SF Markus Elfring
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:43 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 06:47:16 +0200
A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kmalloc_array".
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 3e407a9..f6b817c 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -523,7 +523,7 @@ static char **realloc_argv(unsigned *array_size, char **old_argv)
new_size = 8;
gfp = GFP_NOIO;
}
- argv = kmalloc(new_size * sizeof(*argv), gfp);
+ argv = kmalloc_array(new_size, sizeof(*argv), gfp);
if (argv) {
memcpy(argv, old_argv, *array_size * sizeof(*argv));
*array_size = new_size;
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/9] md/dm-table: Reduce the scope for a variable in dm_table_verify_integrity()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
2016-10-01 7:43 ` [PATCH 1/9] md/dm-table: Use kmalloc_array() in realloc_argv() SF Markus Elfring
@ 2016-10-01 7:44 ` SF Markus Elfring
2016-10-01 7:45 ` [PATCH 3/9] md/dm-table: Delete an unnecessary variable initialisation in dm_table_register_integrity() SF Markus Elfring
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:44 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 07:10:43 +0200
Move the definition for the variable "template_disk" into an if branch
so that an extra initialisation can be avoided at the beginning
by this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index f6b817c..73d38d0 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1391,14 +1391,13 @@ int dm_calculate_queue_limits(struct dm_table *table,
*/
static void dm_table_verify_integrity(struct dm_table *t)
{
- struct gendisk *template_disk = NULL;
-
if (t->integrity_supported) {
/*
* Verify that the original integrity profile
* matches all the devices in this table.
*/
- template_disk = dm_table_get_integrity_disk(t);
+ struct gendisk *template_disk = dm_table_get_integrity_disk(t);
+
if (template_disk &&
blk_integrity_compare(dm_disk(t->md), template_disk) >= 0)
return;
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/9] md/dm-table: Delete an unnecessary variable initialisation in dm_table_register_integrity()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
2016-10-01 7:43 ` [PATCH 1/9] md/dm-table: Use kmalloc_array() in realloc_argv() SF Markus Elfring
2016-10-01 7:44 ` [PATCH 2/9] md/dm-table: Reduce the scope for a variable in dm_table_verify_integrity() SF Markus Elfring
@ 2016-10-01 7:45 ` SF Markus Elfring
2016-10-01 7:46 ` [PATCH 4/9] md/dm-table: Delete an unnecessary variable initialisation in dm_split_args() SF Markus Elfring
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:45 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 07:25:43 +0200
The local variable "template_disk" is reassigned by a statement
at the beginning. Thus omit the explicit initialisation.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 73d38d0..67cc635 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1165,7 +1165,7 @@ static struct gendisk * dm_table_get_integrity_disk(struct dm_table *t)
static int dm_table_register_integrity(struct dm_table *t)
{
struct mapped_device *md = t->md;
- struct gendisk *template_disk = NULL;
+ struct gendisk *template_disk;
template_disk = dm_table_get_integrity_disk(t);
if (!template_disk)
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/9] md/dm-table: Delete an unnecessary variable initialisation in dm_split_args()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (2 preceding siblings ...)
2016-10-01 7:45 ` [PATCH 3/9] md/dm-table: Delete an unnecessary variable initialisation in dm_table_register_integrity() SF Markus Elfring
@ 2016-10-01 7:46 ` SF Markus Elfring
2016-10-01 7:47 ` [PATCH 5/9] md/dm-table: Move an assignment for the variable "end" " SF Markus Elfring
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:46 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 07:37:27 +0200
The local variable "argv" will be set to an appropriate pointer
a bit later. Thus omit the explicit initialisation at the beginning.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 67cc635..e74763c 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -538,7 +538,7 @@ static char **realloc_argv(unsigned *array_size, char **old_argv)
*/
int dm_split_args(int *argc, char ***argvp, char *input)
{
- char *start, *end = input, *out, **argv = NULL;
+ char *start, *end = input, *out, **argv;
unsigned array_size = 0;
*argc = 0;
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/9] md/dm-table: Move an assignment for the variable "end" in dm_split_args()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (3 preceding siblings ...)
2016-10-01 7:46 ` [PATCH 4/9] md/dm-table: Delete an unnecessary variable initialisation in dm_split_args() SF Markus Elfring
@ 2016-10-01 7:47 ` SF Markus Elfring
2016-10-01 7:48 ` [PATCH 6/9] md/dm-table: Combine substrings for ten messages SF Markus Elfring
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:47 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 07:51:55 +0200
Move the assignment for the local variable "end" behind the source code
for the initial two condition checks by this function.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index e74763c..0f60417 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -538,7 +538,7 @@ static char **realloc_argv(unsigned *array_size, char **old_argv)
*/
int dm_split_args(int *argc, char ***argvp, char *input)
{
- char *start, *end = input, *out, **argv;
+ char *start, *end, *out, **argv;
unsigned array_size = 0;
*argc = 0;
@@ -552,6 +552,7 @@ int dm_split_args(int *argc, char ***argvp, char *input)
if (!argv)
return -ENOMEM;
+ end = input;
while (1) {
/* Skip whitespace */
start = skip_spaces(end);
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/9] md/dm-table: Combine substrings for ten messages
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (4 preceding siblings ...)
2016-10-01 7:47 ` [PATCH 5/9] md/dm-table: Move an assignment for the variable "end" " SF Markus Elfring
@ 2016-10-01 7:48 ` SF Markus Elfring
2016-10-01 7:50 ` [PATCH 7/9] md/dm-table: Adjust one function call together with a variable assignment SF Markus Elfring
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:48 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 08:39:58 +0200
The script "checkpatch.pl" pointed information out like the following.
WARNING: quoted string split across lines
Thus fix the affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 0f60417..9b7d8b7 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -296,8 +296,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
*/
q = bdev_get_queue(bdev);
if (!q || !q->make_request_fn) {
- DMWARN("%s: %s is not yet initialised: "
- "start=%llu, len=%llu, dev_size=%llu",
+ DMWARN("%s: %s is not yet initialised: start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
(unsigned long long)start,
(unsigned long long)len,
@@ -309,8 +308,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)) {
- DMWARN("%s: %s too small for target: "
- "start=%llu, len=%llu, dev_size=%llu",
+ DMWARN("%s: %s too small for target: start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
(unsigned long long)start,
(unsigned long long)len,
@@ -322,8 +320,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
return 0;
if (start & (logical_block_size_sectors - 1)) {
- DMWARN("%s: start=%llu not aligned to h/w "
- "logical block size %u of %s",
+ DMWARN("%s: start=%llu not aligned to h/w logical block size %u of %s",
dm_device_name(ti->table->md),
(unsigned long long)start,
limits->logical_block_size, bdevname(bdev, b));
@@ -331,8 +328,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
}
if (len & (logical_block_size_sectors - 1)) {
- DMWARN("%s: len=%llu not aligned to h/w "
- "logical block size %u of %s",
+ DMWARN("%s: len=%llu not aligned to h/w logical block size %u of %s",
dm_device_name(ti->table->md),
(unsigned long long)len,
limits->logical_block_size, bdevname(bdev, b));
@@ -446,9 +442,7 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
}
if (bdev_stack_limits(limits, bdev, start) < 0)
- DMWARN("%s: adding target device %s caused an alignment inconsistency: "
- "physical_block_size=%u, logical_block_size=%u, "
- "alignment_offset=%u, start=%llu",
+ DMWARN("%s: adding target device %s caused an alignment inconsistency: physical_block_size=%u, logical_block_size=%u, alignment_offset=%u, start=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
q->limits.physical_block_size,
q->limits.logical_block_size,
@@ -659,8 +653,7 @@ static int validate_hardware_logical_block_alignment(struct dm_table *table,
}
if (remaining) {
- DMWARN("%s: table line %u (start sect %llu len %llu) "
- "not aligned to h/w logical block size %u",
+ DMWARN("%s: table line %u (start sect %llu len %llu) not aligned to h/w logical block size %u",
dm_device_name(table->md), i,
(unsigned long long) ti->begin,
(unsigned long long) ti->len,
@@ -902,8 +895,7 @@ static int dm_table_determine_type(struct dm_table *t)
bio_based = 1;
if (bio_based && request_based) {
- DMWARN("Inconsistent table: different target types"
- " can't be mixed up");
+ DMWARN("Inconsistent table: different target types can't be mixed up");
return -EINVAL;
}
}
@@ -960,8 +952,7 @@ static int dm_table_determine_type(struct dm_table *t)
struct request_queue *q = bdev_get_queue(dd->dm_dev->bdev);
if (!blk_queue_stackable(q)) {
- DMERR("table load rejected: including"
- " non-request-stackable devices");
+ DMERR("table load rejected: including non-request-stackable devices");
return -EINVAL;
}
@@ -973,8 +964,7 @@ static int dm_table_determine_type(struct dm_table *t)
/* verify _all_ devices in the table are blk-mq devices */
list_for_each_entry(dd, devices, list)
if (!bdev_get_queue(dd->dm_dev->bdev)->mq_ops) {
- DMERR("table load rejected: not all devices"
- " are blk-mq request-stackable");
+ DMERR("table load rejected: not all devices are blk-mq request-stackable");
return -EINVAL;
}
@@ -1374,9 +1364,7 @@ int dm_calculate_queue_limits(struct dm_table *table,
* for the table.
*/
if (blk_stack_limits(limits, &ti_limits, 0) < 0)
- DMWARN("%s: adding target device "
- "(start sect %llu len %llu) "
- "caused an alignment inconsistency",
+ DMWARN("%s: adding target device (start sect %llu len %llu) caused an alignment inconsistency",
dm_device_name(table->md),
(unsigned long long) ti->begin,
(unsigned long long) ti->len);
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/9] md/dm-table: Adjust one function call together with a variable assignment
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (5 preceding siblings ...)
2016-10-01 7:48 ` [PATCH 6/9] md/dm-table: Combine substrings for ten messages SF Markus Elfring
@ 2016-10-01 7:50 ` SF Markus Elfring
2016-10-01 7:52 ` [PATCH 8/9] md/dm-table: Delete an unwanted space in high() SF Markus Elfring
2016-10-01 7:53 ` [PATCH 9/9] md/dm-table: Delete an unwanted space in dm_table_get_integrity_disk() SF Markus Elfring
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:50 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 08:53:37 +0200
The script "checkpatch.pl" pointed information out like the following.
ERROR: do not use assignment in if condition
Thus fix the affected source code place.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 9b7d8b7..40dde87 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -407,7 +407,8 @@ int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
if (!dd)
return -ENOMEM;
- if ((r = dm_get_table_device(t->md, dev, mode, &dd->dm_dev))) {
+ r = dm_get_table_device(t->md, dev, mode, &dd->dm_dev);
+ if (r) {
kfree(dd);
return r;
}
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/9] md/dm-table: Delete an unwanted space in high()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (6 preceding siblings ...)
2016-10-01 7:50 ` [PATCH 7/9] md/dm-table: Adjust one function call together with a variable assignment SF Markus Elfring
@ 2016-10-01 7:52 ` SF Markus Elfring
2016-10-01 7:53 ` [PATCH 9/9] md/dm-table: Delete an unwanted space in dm_table_get_integrity_disk() SF Markus Elfring
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:52 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 09:04:06 +0200
The script "checkpatch.pl" pointed information out like the following.
ERROR: space prohibited after that '-' (ctx:WxW)
Thus fix the affected source code place.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 40dde87..a948ffb 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -109,7 +109,7 @@ static sector_t high(struct dm_table *t, unsigned int l, unsigned int n)
n = get_child(n, CHILDREN_PER_NODE - 1);
if (n >= t->counts[l])
- return (sector_t) - 1;
+ return (sector_t) -1;
return get_node(t, l, n)[KEYS_PER_NODE - 1];
}
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 9/9] md/dm-table: Delete an unwanted space in dm_table_get_integrity_disk()
2016-10-01 7:41 [PATCH 0/9] md/dm-table: Fine-tuning for several function implementations SF Markus Elfring
` (7 preceding siblings ...)
2016-10-01 7:52 ` [PATCH 8/9] md/dm-table: Delete an unwanted space in high() SF Markus Elfring
@ 2016-10-01 7:53 ` SF Markus Elfring
8 siblings, 0 replies; 10+ messages in thread
From: SF Markus Elfring @ 2016-10-01 7:53 UTC (permalink / raw)
To: dm-devel, linux-raid, Alasdair Kergon, Mike Snitzer, Shaohua Li
Cc: LKML, kernel-janitors, Julia Lawall
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 1 Oct 2016 09:24:56 +0200
The script "checkpatch.pl" pointed information out like the following.
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index a948ffb..3ad1b1a 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1117,7 +1117,7 @@ static bool integrity_profile_exists(struct gendisk *disk)
* Get a disk whose integrity profile reflects the table's profile.
* Returns NULL if integrity support was inconsistent or unavailable.
*/
-static struct gendisk * dm_table_get_integrity_disk(struct dm_table *t)
+static struct gendisk *dm_table_get_integrity_disk(struct dm_table *t)
{
struct list_head *devices = dm_table_get_devices(t);
struct dm_dev_internal *dd = NULL;
--
2.10.0
^ permalink raw reply related [flat|nested] 10+ messages in thread