diff options
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 3 | ||||
| -rw-r--r-- | drivers/block/ps3vram.c | 3 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/blkback.c | 3 | ||||
| -rw-r--r-- | drivers/block/xen-blkback/xenbus.c | 9 | ||||
| -rw-r--r-- | drivers/block/xen-blkfront.c | 3 | ||||
| -rw-r--r-- | drivers/block/z2ram.c | 3 |
6 files changed, 8 insertions, 16 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index c2dd784bc14b..3cfef456a1f3 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3932,8 +3932,7 @@ static int receive_sizes(struct drbd_connection *connection, struct packet_info if (my_usize != p_usize) { struct disk_conf *old_disk_conf, *new_disk_conf = NULL; - new_disk_conf = kzalloc_obj(struct disk_conf, - GFP_KERNEL); + new_disk_conf = kzalloc_obj(struct disk_conf); if (!new_disk_conf) { put_ldev(device); return -ENOMEM; diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 7844424f7b17..41cc8cefea01 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -401,8 +401,7 @@ static int ps3vram_cache_init(struct ps3_system_bus_device *dev) priv->cache.page_count = CACHE_PAGE_COUNT; priv->cache.page_size = CACHE_PAGE_SIZE; - priv->cache.tags = kzalloc_objs(struct ps3vram_tag, CACHE_PAGE_COUNT, - GFP_KERNEL); + priv->cache.tags = kzalloc_objs(struct ps3vram_tag, CACHE_PAGE_COUNT); if (!priv->cache.tags) return -ENOMEM; diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index bc665b8abd7b..7871099bc0d4 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -846,8 +846,7 @@ again: * We are using persistent grants, the grant is * not mapped but we might have room for it. */ - persistent_gnt = kmalloc_obj(struct persistent_gnt, - GFP_KERNEL); + persistent_gnt = kmalloc_obj(struct persistent_gnt); if (!persistent_gnt) { /* * If we don't have enough memory to diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index adfd61af86ee..4b865ef800b1 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -131,8 +131,7 @@ static int xen_blkif_alloc_rings(struct xen_blkif *blkif) { unsigned int r; - blkif->rings = kzalloc_objs(struct xen_blkif_ring, blkif->nr_rings, - GFP_KERNEL); + blkif->rings = kzalloc_objs(struct xen_blkif_ring, blkif->nr_rings); if (!blkif->rings) return -ENOMEM; @@ -1014,14 +1013,12 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) goto fail; list_add_tail(&req->free_list, &ring->pending_free); for (j = 0; j < MAX_INDIRECT_SEGMENTS; j++) { - req->segments[j] = kzalloc_obj(*req->segments[0], - GFP_KERNEL); + req->segments[j] = kzalloc_obj(*req->segments[0]); if (!req->segments[j]) goto fail; } for (j = 0; j < MAX_INDIRECT_PAGES; j++) { - req->indirect_pages[j] = kzalloc_obj(*req->indirect_pages[0], - GFP_KERNEL); + req->indirect_pages[j] = kzalloc_obj(*req->indirect_pages[0]); if (!req->indirect_pages[j]) goto fail; } diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 777a5ae0cd33..8fc7fc3bf867 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2207,8 +2207,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo) for (i = 0; i < BLK_RING_SIZE(info); i++) { rinfo->shadow[i].grants_used = - kvzalloc_objs(rinfo->shadow[i].grants_used[0], grants, - GFP_KERNEL); + kvzalloc_objs(rinfo->shadow[i].grants_used[0], grants); rinfo->shadow[i].sg = kvzalloc_objs(rinfo->shadow[i].sg[0], psegs, GFP_KERNEL); if (info->max_indirect_segments) diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index e12abdec2647..b216cba1c3bf 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -187,8 +187,7 @@ static int z2_open(struct gendisk *disk, blk_mode_t mode) (unsigned long)z_remap_nocache_nonser(paddr, size); #endif z2ram_map = - kmalloc_objs(z2ram_map[0], size / Z2RAM_CHUNKSIZE, - GFP_KERNEL); + kmalloc_objs(z2ram_map[0], size / Z2RAM_CHUNKSIZE); if (z2ram_map == NULL) { printk(KERN_ERR DEVICE_NAME ": cannot get mem for z2ram_map\n"); |