diff options
Diffstat (limited to 'drivers/md/bcache')
| -rw-r--r-- | drivers/md/bcache/alloc.c | 2 | ||||
| -rw-r--r-- | drivers/md/bcache/debug.c | 2 | ||||
| -rw-r--r-- | drivers/md/bcache/super.c | 14 | ||||
| -rw-r--r-- | drivers/md/bcache/sysfs.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index 90cc6ed4bd6d..3ec240ec685d 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c @@ -697,7 +697,7 @@ int bch_open_buckets_alloc(struct cache_set *c) spin_lock_init(&c->data_bucket_lock); for (i = 0; i < MAX_OPEN_BUCKETS; i++) { - struct open_bucket *b = kzalloc_obj(*b, GFP_KERNEL); + struct open_bucket *b = kzalloc_obj(*b); if (!b) return -ENOMEM; diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c index 55f5e202015d..2691a5da3368 100644 --- a/drivers/md/bcache/debug.c +++ b/drivers/md/bcache/debug.c @@ -208,7 +208,7 @@ static int bch_dump_open(struct inode *inode, struct file *file) struct cache_set *c = inode->i_private; struct dump_iterator *i; - i = kzalloc_obj(struct dump_iterator, GFP_KERNEL); + i = kzalloc_obj(struct dump_iterator); if (!i) return -ENOMEM; diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index a304ef80820b..64bb38c95895 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1527,7 +1527,7 @@ static CLOSURE_CALLBACK(flash_dev_flush) static int flash_dev_run(struct cache_set *c, struct uuid_entry *u) { int err = -ENOMEM; - struct bcache_device *d = kzalloc_obj(struct bcache_device, GFP_KERNEL); + struct bcache_device *d = kzalloc_obj(struct bcache_device); if (!d) goto err_ret; @@ -1863,7 +1863,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) { int iter_size; struct cache *ca = container_of(sb, struct cache, sb); - struct cache_set *c = kzalloc_obj(struct cache_set, GFP_KERNEL); + struct cache_set *c = kzalloc_obj(struct cache_set); if (!c) return NULL; @@ -2542,8 +2542,8 @@ static void register_device_async(struct async_reg_args *args) static void *alloc_holder_object(struct cache_sb *sb) { if (SB_IS_BDEV(sb)) - return kzalloc_obj(struct cached_dev, GFP_KERNEL); - return kzalloc_obj(struct cache, GFP_KERNEL); + return kzalloc_obj(struct cached_dev); + return kzalloc_obj(struct cache); } static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, @@ -2580,7 +2580,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, if (!path) goto out_module_put; - sb = kmalloc_obj(struct cache_sb, GFP_KERNEL); + sb = kmalloc_obj(struct cache_sb); if (!sb) goto out_free_path; @@ -2632,7 +2632,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, if (async_registration) { /* register in asynchronous way */ struct async_reg_args *args = - kzalloc_obj(struct async_reg_args, GFP_KERNEL); + kzalloc_obj(struct async_reg_args); if (!args) { ret = -ENOMEM; @@ -2709,7 +2709,7 @@ static ssize_t bch_pending_bdevs_cleanup(struct kobject *k, mutex_lock(&bch_register_lock); list_for_each_entry_safe(dc, tdc, &uncached_devices, list) { - pdev = kmalloc_obj(struct pdev, GFP_KERNEL); + pdev = kmalloc_obj(struct pdev); if (!pdev) break; pdev->dc = dc; diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c index b30424075106..cfac56caa804 100644 --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c @@ -415,7 +415,7 @@ STORE(__cached_dev) buf, SB_LABEL_SIZE); bch_uuid_write(dc->disk.c); } - env = kzalloc_obj(struct kobj_uevent_env, GFP_KERNEL); + env = kzalloc_obj(struct kobj_uevent_env); if (!env) return -ENOMEM; add_uevent_var(env, "DRIVER=bcache"); |
