summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-snap-persistent.c3
-rw-r--r--drivers/md/dm-snap.c3
-rw-r--r--drivers/md/dm-zoned-metadata.c3
-rw-r--r--drivers/md/raid0.c3
-rw-r--r--drivers/md/raid1.c6
-rw-r--r--drivers/md/raid5-ppl.c3
-rw-r--r--drivers/md/raid5.c3
7 files changed, 8 insertions, 16 deletions
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 2f429ca8e5aa..aa239ccda270 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -626,8 +626,7 @@ static int persistent_read_metadata(struct dm_exception_store *store,
*/
ps->exceptions_per_area = (ps->store->chunk_size << SECTOR_SHIFT) /
sizeof(struct disk_exception);
- ps->callbacks = kvzalloc_objs(*ps->callbacks, ps->exceptions_per_area,
- GFP_KERNEL);
+ ps->callbacks = kvzalloc_objs(*ps->callbacks, ps->exceptions_per_area);
if (!ps->callbacks)
return -ENOMEM;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index f31e4b8f4457..1489fda9d24a 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -362,8 +362,7 @@ static int init_origin_hash(void)
for (i = 0; i < ORIGIN_HASH_SIZE; i++)
INIT_LIST_HEAD(_origins + i);
- _dm_origins = kmalloc_objs(struct list_head, ORIGIN_HASH_SIZE,
- GFP_KERNEL);
+ _dm_origins = kmalloc_objs(struct list_head, ORIGIN_HASH_SIZE);
if (!_dm_origins) {
DMERR("unable to allocate memory for _dm_origins");
kfree(_origins);
diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
index 8d7edd18117d..ec605acddd88 100644
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@ -1686,8 +1686,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)
unsigned int bzone_id;
/* Metadata block array for the chunk mapping table */
- zmd->map_mblk = kzalloc_objs(struct dmz_mblock *, zmd->nr_map_blocks,
- GFP_KERNEL);
+ zmd->map_mblk = kzalloc_objs(struct dmz_mblock *, zmd->nr_map_blocks);
if (!zmd->map_mblk)
return -ENOMEM;
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index b79d1a0883dc..ef0045db409f 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -143,8 +143,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
}
err = -ENOMEM;
- conf->strip_zone = kzalloc_objs(struct strip_zone, conf->nr_strip_zones,
- GFP_KERNEL);
+ conf->strip_zone = kzalloc_objs(struct strip_zone, conf->nr_strip_zones);
if (!conf->strip_zone)
goto abort;
conf->devlist = kzalloc(array3_size(sizeof(struct md_rdev *),
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index cef705c5ffd4..181400e147c0 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3073,13 +3073,11 @@ static struct r1conf *setup_conf(struct mddev *mddev)
if (!conf)
goto abort;
- conf->nr_pending = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR,
- GFP_KERNEL);
+ conf->nr_pending = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR);
if (!conf->nr_pending)
goto abort;
- conf->nr_waiting = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR,
- GFP_KERNEL);
+ conf->nr_waiting = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR);
if (!conf->nr_waiting)
goto abort;
diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index b0c524e920cb..7be1648c4e4f 100644
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -1378,8 +1378,7 @@ int ppl_init_log(struct r5conf *conf)
goto err;
ppl_conf->count = conf->raid_disks;
- ppl_conf->child_logs = kzalloc_objs(struct ppl_log, ppl_conf->count,
- GFP_KERNEL);
+ ppl_conf->child_logs = kzalloc_objs(struct ppl_log, ppl_conf->count);
if (!ppl_conf->child_logs) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index b785d129ef50..a8e8d431071b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -7508,8 +7508,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
#endif
INIT_LIST_HEAD(&conf->free_list);
INIT_LIST_HEAD(&conf->pending_list);
- conf->pending_data = kzalloc_objs(struct r5pending_data, PENDING_IO_MAX,
- GFP_KERNEL);
+ conf->pending_data = kzalloc_objs(struct r5pending_data, PENDING_IO_MAX);
if (!conf->pending_data)
goto abort;
for (i = 0; i < PENDING_IO_MAX; i++)