[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()
All kcalloc() calls of the form "kcalloc(1,...)" are converted to the equivalent kzalloc() calls, and a few kcalloc() calls with the incorrect ordering of the first two arguments are fixed. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Adam Belay <ambx1@neo.rr.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Greg KH <greg@kroah.com> Cc: Mark Fasheh <mark.fasheh@oracle.com> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
90aef12e6d
commit
cd86128088
33 changed files with 89 additions and 89 deletions
|
@ -551,7 +551,7 @@ static int adma_port_start(struct ata_port *ap)
|
||||||
return rc;
|
return rc;
|
||||||
adma_enter_reg_mode(ap);
|
adma_enter_reg_mode(ap);
|
||||||
rc = -ENOMEM;
|
rc = -ENOMEM;
|
||||||
pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
|
pp = kzalloc(sizeof(*pp), GFP_KERNEL);
|
||||||
if (!pp)
|
if (!pp)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma,
|
pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma,
|
||||||
|
@ -672,7 +672,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
|
||||||
if (rc)
|
if (rc)
|
||||||
goto err_out_iounmap;
|
goto err_out_iounmap;
|
||||||
|
|
||||||
probe_ent = kcalloc(1, sizeof(*probe_ent), GFP_KERNEL);
|
probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);
|
||||||
if (probe_ent == NULL) {
|
if (probe_ent == NULL) {
|
||||||
rc = -ENOMEM;
|
rc = -ENOMEM;
|
||||||
goto err_out_iounmap;
|
goto err_out_iounmap;
|
||||||
|
|
|
@ -945,7 +945,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
|
||||||
*/
|
*/
|
||||||
tlen = sizeof(struct property) + len + 18;
|
tlen = sizeof(struct property) + len + 18;
|
||||||
|
|
||||||
prop = kcalloc(tlen, 1, GFP_KERNEL);
|
prop = kzalloc(tlen, GFP_KERNEL);
|
||||||
if (prop == NULL)
|
if (prop == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
hdr = (struct smu_sdbp_header *)(prop + 1);
|
hdr = (struct smu_sdbp_header *)(prop + 1);
|
||||||
|
|
|
@ -768,7 +768,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
|
||||||
if (mtd->type != MTD_NORFLASH)
|
if (mtd->type != MTD_NORFLASH)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
part = kcalloc(1, sizeof(struct partition), GFP_KERNEL);
|
part = kzalloc(sizeof(struct partition), GFP_KERNEL);
|
||||||
if (!part)
|
if (!part)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
|
||||||
struct phy_device *dev;
|
struct phy_device *dev;
|
||||||
/* We allocate the device, and initialize the
|
/* We allocate the device, and initialize the
|
||||||
* default values */
|
* default values */
|
||||||
dev = kcalloc(1, sizeof(*dev), GFP_KERNEL);
|
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
||||||
|
|
||||||
if (NULL == dev)
|
if (NULL == dev)
|
||||||
return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
|
return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
|
||||||
|
|
|
@ -749,7 +749,7 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base)
|
||||||
struct skge_element *e;
|
struct skge_element *e;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
ring->start = kcalloc(sizeof(*e), ring->count, GFP_KERNEL);
|
ring->start = kcalloc(ring->count, sizeof(*e), GFP_KERNEL);
|
||||||
if (!ring->start)
|
if (!ring->start)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -230,7 +230,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
|
||||||
if (!io)
|
if (!io)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
|
cf = kzalloc(sizeof *cf, GFP_KERNEL);
|
||||||
if (!cf)
|
if (!cf)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -220,7 +220,7 @@ static int __devinit omap_cf_probe(struct device *dev)
|
||||||
if (irq < 0)
|
if (irq < 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
|
cf = kzalloc(sizeof *cf, GFP_KERNEL);
|
||||||
if (!cf)
|
if (!cf)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
init_timer(&cf->timer);
|
init_timer(&cf->timer);
|
||||||
|
|
|
@ -395,7 +395,7 @@ static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigne
|
||||||
struct pnp_id * id;
|
struct pnp_id * id;
|
||||||
if (!dev)
|
if (!dev)
|
||||||
return;
|
return;
|
||||||
id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||||
if (!id)
|
if (!id)
|
||||||
return;
|
return;
|
||||||
sprintf(id->id, "%c%c%c%x%x%x%x",
|
sprintf(id->id, "%c%c%c%x%x%x%x",
|
||||||
|
@ -419,7 +419,7 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
|
||||||
struct pnp_dev *dev;
|
struct pnp_dev *dev;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
|
dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
return NULL;
|
return NULL;
|
||||||
dev->number = number;
|
dev->number = number;
|
||||||
|
@ -450,7 +450,7 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
|
||||||
unsigned long bits;
|
unsigned long bits;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
|
irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
|
||||||
if (!irq)
|
if (!irq)
|
||||||
return;
|
return;
|
||||||
bits = (tmp[1] << 8) | tmp[0];
|
bits = (tmp[1] << 8) | tmp[0];
|
||||||
|
@ -474,7 +474,7 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
|
||||||
struct pnp_dma *dma;
|
struct pnp_dma *dma;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
|
dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
|
||||||
if (!dma)
|
if (!dma)
|
||||||
return;
|
return;
|
||||||
dma->map = tmp[0];
|
dma->map = tmp[0];
|
||||||
|
@ -494,7 +494,7 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
|
||||||
struct pnp_port *port;
|
struct pnp_port *port;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = (tmp[2] << 8) | tmp[1];
|
port->min = (tmp[2] << 8) | tmp[1];
|
||||||
|
@ -517,7 +517,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
|
||||||
struct pnp_port *port;
|
struct pnp_port *port;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = port->max = (tmp[1] << 8) | tmp[0];
|
port->min = port->max = (tmp[1] << 8) | tmp[0];
|
||||||
|
@ -539,7 +539,7 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
|
||||||
struct pnp_mem *mem;
|
struct pnp_mem *mem;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
|
mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
|
||||||
|
@ -562,7 +562,7 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
|
||||||
struct pnp_mem *mem;
|
struct pnp_mem *mem;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
|
mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
|
||||||
|
@ -584,7 +584,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
|
||||||
struct pnp_mem *mem;
|
struct pnp_mem *mem;
|
||||||
|
|
||||||
isapnp_peek(tmp, size);
|
isapnp_peek(tmp, size);
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
|
mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
|
||||||
|
@ -829,7 +829,7 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
|
||||||
|
|
||||||
static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
|
static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
|
||||||
{
|
{
|
||||||
struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
struct pnp_id * id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||||
if (!id)
|
if (!id)
|
||||||
return;
|
return;
|
||||||
sprintf(id->id, "%c%c%c%x%x%x%x",
|
sprintf(id->id, "%c%c%c%x%x%x%x",
|
||||||
|
@ -865,7 +865,7 @@ static int __init isapnp_build_device_list(void)
|
||||||
header[4], header[5], header[6], header[7], header[8]);
|
header[4], header[5], header[6], header[7], header[8]);
|
||||||
printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
|
printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
|
||||||
#endif
|
#endif
|
||||||
if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
|
if ((card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
card->number = csn;
|
card->number = csn;
|
||||||
|
|
|
@ -139,7 +139,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
|
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
|
||||||
dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
|
dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
|
||||||
if (!dev) {
|
if (!dev) {
|
||||||
pnp_err("Out of memory");
|
pnp_err("Out of memory");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -169,7 +169,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||||
dev->number = num;
|
dev->number = num;
|
||||||
|
|
||||||
/* set the initial values for the PnP device */
|
/* set the initial values for the PnP device */
|
||||||
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||||
if (!dev_id)
|
if (!dev_id)
|
||||||
goto err;
|
goto err;
|
||||||
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
|
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
|
||||||
|
@ -201,7 +201,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||||
for (i = 0; i < cid_list->count; i++) {
|
for (i = 0; i < cid_list->count; i++) {
|
||||||
if (!ispnpidacpi(cid_list->id[i].value))
|
if (!ispnpidacpi(cid_list->id[i].value))
|
||||||
continue;
|
continue;
|
||||||
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||||
if (!dev_id)
|
if (!dev_id)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
|
@ -298,7 +298,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
|
||||||
|
|
||||||
if (p->channel_count == 0)
|
if (p->channel_count == 0)
|
||||||
return;
|
return;
|
||||||
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
|
dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
|
||||||
if (!dma)
|
if (!dma)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -354,7 +354,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (p->interrupt_count == 0)
|
if (p->interrupt_count == 0)
|
||||||
return;
|
return;
|
||||||
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
|
irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
|
||||||
if (!irq)
|
if (!irq)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -375,7 +375,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (p->interrupt_count == 0)
|
if (p->interrupt_count == 0)
|
||||||
return;
|
return;
|
||||||
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
|
irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
|
||||||
if (!irq)
|
if (!irq)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -396,7 +396,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (io->address_length == 0)
|
if (io->address_length == 0)
|
||||||
return;
|
return;
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = io->minimum;
|
port->min = io->minimum;
|
||||||
|
@ -417,7 +417,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (io->address_length == 0)
|
if (io->address_length == 0)
|
||||||
return;
|
return;
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = port->max = io->address;
|
port->min = port->max = io->address;
|
||||||
|
@ -436,7 +436,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (p->address_length == 0)
|
if (p->address_length == 0)
|
||||||
return;
|
return;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = p->minimum;
|
mem->min = p->minimum;
|
||||||
|
@ -459,7 +459,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (p->address_length == 0)
|
if (p->address_length == 0)
|
||||||
return;
|
return;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = p->minimum;
|
mem->min = p->minimum;
|
||||||
|
@ -482,7 +482,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
|
||||||
|
|
||||||
if (p->address_length == 0)
|
if (p->address_length == 0)
|
||||||
return;
|
return;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = mem->max = p->address;
|
mem->min = mem->max = p->address;
|
||||||
|
@ -514,7 +514,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (p->resource_type == ACPI_MEMORY_RANGE) {
|
if (p->resource_type == ACPI_MEMORY_RANGE) {
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = mem->max = p->minimum;
|
mem->min = mem->max = p->minimum;
|
||||||
|
@ -524,7 +524,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
|
||||||
ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
|
ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
|
||||||
pnp_register_mem_resource(option, mem);
|
pnp_register_mem_resource(option, mem);
|
||||||
} else if (p->resource_type == ACPI_IO_RANGE) {
|
} else if (p->resource_type == ACPI_IO_RANGE) {
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = port->max = p->minimum;
|
port->min = port->max = p->minimum;
|
||||||
|
@ -721,7 +721,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
|
||||||
if (!res_cnt)
|
if (!res_cnt)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
|
buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
|
||||||
buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
|
buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL);
|
||||||
if (!buffer->pointer)
|
if (!buffer->pointer)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
pnp_dbg("Res cnt %d", res_cnt);
|
pnp_dbg("Res cnt %d", res_cnt);
|
||||||
|
|
|
@ -112,7 +112,7 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
|
||||||
if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
|
if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
|
if (!(buf = kzalloc(256, GFP_KERNEL))) {
|
||||||
kfree (envp);
|
kfree (envp);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
@ -220,7 +220,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
|
||||||
if(!pnpbios_is_dynamic(dev))
|
if(!pnpbios_is_dynamic(dev))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node)
|
if (!node)
|
||||||
return -1;
|
return -1;
|
||||||
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
|
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
|
||||||
|
@ -243,7 +243,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
|
||||||
if (!pnpbios_is_dynamic(dev))
|
if (!pnpbios_is_dynamic(dev))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node)
|
if (!node)
|
||||||
return -1;
|
return -1;
|
||||||
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
|
if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
|
||||||
|
@ -294,7 +294,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
|
||||||
if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
|
if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node)
|
if (!node)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -336,7 +336,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set the initial values for the PnP device */
|
/* set the initial values for the PnP device */
|
||||||
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||||
if (!dev_id)
|
if (!dev_id)
|
||||||
return -1;
|
return -1;
|
||||||
pnpid32_to_pnpid(node->eisa_id,id);
|
pnpid32_to_pnpid(node->eisa_id,id);
|
||||||
|
@ -374,7 +374,7 @@ static void __init build_devlist(void)
|
||||||
struct pnp_bios_node *node;
|
struct pnp_bios_node *node;
|
||||||
struct pnp_dev *dev;
|
struct pnp_dev *dev;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node)
|
if (!node)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -391,7 +391,7 @@ static void __init build_devlist(void)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
nodes_got++;
|
nodes_got++;
|
||||||
dev = kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
|
dev = kzalloc(sizeof (struct pnp_dev), GFP_KERNEL);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
break;
|
break;
|
||||||
if(insert_device(dev,node)<0)
|
if(insert_device(dev,node)<0)
|
||||||
|
|
|
@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
|
||||||
return -EFBIG;
|
return -EFBIG;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
|
tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL);
|
||||||
if (!tmpbuf) return -ENOMEM;
|
if (!tmpbuf) return -ENOMEM;
|
||||||
|
|
||||||
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
|
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
|
||||||
|
@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
|
||||||
if (pos >= 0xff)
|
if (pos >= 0xff)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node) return -ENOMEM;
|
if (!node) return -ENOMEM;
|
||||||
|
|
||||||
for (nodenum=pos; nodenum<0xff; ) {
|
for (nodenum=pos; nodenum<0xff; ) {
|
||||||
|
@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
|
||||||
u8 nodenum = (long)data;
|
u8 nodenum = (long)data;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node) return -ENOMEM;
|
if (!node) return -ENOMEM;
|
||||||
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
|
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
|
||||||
kfree(node);
|
kfree(node);
|
||||||
|
@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
|
||||||
u8 nodenum = (long)data;
|
u8 nodenum = (long)data;
|
||||||
int ret = count;
|
int ret = count;
|
||||||
|
|
||||||
node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
|
node = kzalloc(node_info.max_node_size, GFP_KERNEL);
|
||||||
if (!node)
|
if (!node)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
|
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
|
||||||
|
|
|
@ -248,7 +248,7 @@ static void
|
||||||
pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_mem * mem;
|
struct pnp_mem * mem;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = ((p[5] << 8) | p[4]) << 8;
|
mem->min = ((p[5] << 8) | p[4]) << 8;
|
||||||
|
@ -264,7 +264,7 @@ static void
|
||||||
pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_mem * mem;
|
struct pnp_mem * mem;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
|
mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
|
||||||
|
@ -280,7 +280,7 @@ static void
|
||||||
pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_mem * mem;
|
struct pnp_mem * mem;
|
||||||
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
|
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return;
|
return;
|
||||||
mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
|
mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
|
||||||
|
@ -297,7 +297,7 @@ pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
struct pnp_irq * irq;
|
struct pnp_irq * irq;
|
||||||
unsigned long bits;
|
unsigned long bits;
|
||||||
|
|
||||||
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
|
irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
|
||||||
if (!irq)
|
if (!irq)
|
||||||
return;
|
return;
|
||||||
bits = (p[2] << 8) | p[1];
|
bits = (p[2] << 8) | p[1];
|
||||||
|
@ -314,7 +314,7 @@ static void
|
||||||
pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_dma * dma;
|
struct pnp_dma * dma;
|
||||||
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
|
dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
|
||||||
if (!dma)
|
if (!dma)
|
||||||
return;
|
return;
|
||||||
dma->map = p[1];
|
dma->map = p[1];
|
||||||
|
@ -327,7 +327,7 @@ static void
|
||||||
pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_port * port;
|
struct pnp_port * port;
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = (p[3] << 8) | p[2];
|
port->min = (p[3] << 8) | p[2];
|
||||||
|
@ -343,7 +343,7 @@ static void
|
||||||
pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
|
pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
|
||||||
{
|
{
|
||||||
struct pnp_port * port;
|
struct pnp_port * port;
|
||||||
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
|
port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
|
||||||
if (!port)
|
if (!port)
|
||||||
return;
|
return;
|
||||||
port->min = port->max = (p[2] << 8) | p[1];
|
port->min = port->max = (p[2] << 8) | p[1];
|
||||||
|
@ -527,7 +527,7 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de
|
||||||
case SMALL_TAG_COMPATDEVID: /* compatible ID */
|
case SMALL_TAG_COMPATDEVID: /* compatible ID */
|
||||||
if (len != 4)
|
if (len != 4)
|
||||||
goto len_err;
|
goto len_err;
|
||||||
dev_id = kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL);
|
dev_id = kzalloc(sizeof (struct pnp_id), GFP_KERNEL);
|
||||||
if (!dev_id)
|
if (!dev_id)
|
||||||
return NULL;
|
return NULL;
|
||||||
memset(dev_id, 0, sizeof(struct pnp_id));
|
memset(dev_id, 0, sizeof(struct pnp_id));
|
||||||
|
|
|
@ -5545,7 +5545,7 @@ int sym_hcb_attach(struct Scsi_Host *shost, struct sym_fw *fw, struct sym_nvram
|
||||||
/*
|
/*
|
||||||
* Allocate the array of lists of CCBs hashed by DSA.
|
* Allocate the array of lists of CCBs hashed by DSA.
|
||||||
*/
|
*/
|
||||||
np->ccbh = kcalloc(sizeof(struct sym_ccb **), CCB_HASH_SIZE, GFP_KERNEL);
|
np->ccbh = kcalloc(CCB_HASH_SIZE, sizeof(struct sym_ccb **), GFP_KERNEL);
|
||||||
if (!np->ccbh)
|
if (!np->ccbh)
|
||||||
goto attach_failed;
|
goto attach_failed;
|
||||||
|
|
||||||
|
|
|
@ -598,7 +598,7 @@ at91_ep_alloc_request(struct usb_ep *_ep, unsigned int gfp_flags)
|
||||||
{
|
{
|
||||||
struct at91_request *req;
|
struct at91_request *req;
|
||||||
|
|
||||||
req = kcalloc(1, sizeof (struct at91_request), gfp_flags);
|
req = kzalloc(sizeof (struct at91_request), gfp_flags);
|
||||||
if (!req)
|
if (!req)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -705,7 +705,7 @@ static int uss720_probe(struct usb_interface *intf,
|
||||||
/*
|
/*
|
||||||
* Allocate parport interface
|
* Allocate parport interface
|
||||||
*/
|
*/
|
||||||
if (!(priv = kcalloc(sizeof(struct parport_uss720_private), 1, GFP_KERNEL))) {
|
if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) {
|
||||||
usb_put_dev(usbdev);
|
usb_put_dev(usbdev);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
|
@ -469,7 +469,7 @@ static void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
|
||||||
struct rndis_halt *halt;
|
struct rndis_halt *halt;
|
||||||
|
|
||||||
/* try to clear any rndis state/activity (no i/o from stack!) */
|
/* try to clear any rndis state/activity (no i/o from stack!) */
|
||||||
halt = kcalloc(1, sizeof *halt, GFP_KERNEL);
|
halt = kzalloc(sizeof *halt, GFP_KERNEL);
|
||||||
if (halt) {
|
if (halt) {
|
||||||
halt->msg_type = RNDIS_MSG_HALT;
|
halt->msg_type = RNDIS_MSG_HALT;
|
||||||
halt->msg_len = ccpu2(sizeof *halt);
|
halt->msg_len = ccpu2(sizeof *halt);
|
||||||
|
|
|
@ -1959,7 +1959,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
|
|
||||||
*tc = kcalloc(1, sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
|
*tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
|
||||||
if (!(*tc)) {
|
if (!(*tc)) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
|
|
@ -1553,7 +1553,7 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
|
||||||
struct o2hb_region *reg = NULL;
|
struct o2hb_region *reg = NULL;
|
||||||
struct config_item *ret = NULL;
|
struct config_item *ret = NULL;
|
||||||
|
|
||||||
reg = kcalloc(1, sizeof(struct o2hb_region), GFP_KERNEL);
|
reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
|
||||||
if (reg == NULL)
|
if (reg == NULL)
|
||||||
goto out; /* ENOMEM */
|
goto out; /* ENOMEM */
|
||||||
|
|
||||||
|
@ -1679,7 +1679,7 @@ struct config_group *o2hb_alloc_hb_set(void)
|
||||||
struct o2hb_heartbeat_group *hs = NULL;
|
struct o2hb_heartbeat_group *hs = NULL;
|
||||||
struct config_group *ret = NULL;
|
struct config_group *ret = NULL;
|
||||||
|
|
||||||
hs = kcalloc(1, sizeof(struct o2hb_heartbeat_group), GFP_KERNEL);
|
hs = kzalloc(sizeof(struct o2hb_heartbeat_group), GFP_KERNEL);
|
||||||
if (hs == NULL)
|
if (hs == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -714,7 +714,7 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group,
|
||||||
if (strlen(name) > O2NM_MAX_NAME_LEN)
|
if (strlen(name) > O2NM_MAX_NAME_LEN)
|
||||||
goto out; /* ENAMETOOLONG */
|
goto out; /* ENAMETOOLONG */
|
||||||
|
|
||||||
node = kcalloc(1, sizeof(struct o2nm_node), GFP_KERNEL);
|
node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL);
|
||||||
if (node == NULL)
|
if (node == NULL)
|
||||||
goto out; /* ENOMEM */
|
goto out; /* ENOMEM */
|
||||||
|
|
||||||
|
@ -825,8 +825,8 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
|
||||||
if (o2nm_single_cluster)
|
if (o2nm_single_cluster)
|
||||||
goto out; /* ENOSPC */
|
goto out; /* ENOSPC */
|
||||||
|
|
||||||
cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_KERNEL);
|
cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
|
||||||
ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_KERNEL);
|
ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
|
||||||
defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
|
defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
|
||||||
o2hb_group = o2hb_alloc_hb_set();
|
o2hb_group = o2hb_alloc_hb_set();
|
||||||
if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
|
if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
|
||||||
|
|
|
@ -324,7 +324,7 @@ static struct o2net_sock_container *sc_alloc(struct o2nm_node *node)
|
||||||
struct page *page = NULL;
|
struct page *page = NULL;
|
||||||
|
|
||||||
page = alloc_page(GFP_NOFS);
|
page = alloc_page(GFP_NOFS);
|
||||||
sc = kcalloc(1, sizeof(*sc), GFP_NOFS);
|
sc = kzalloc(sizeof(*sc), GFP_NOFS);
|
||||||
if (sc == NULL || page == NULL)
|
if (sc == NULL || page == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -714,7 +714,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
nmh = kcalloc(1, sizeof(struct o2net_msg_handler), GFP_NOFS);
|
nmh = kzalloc(sizeof(struct o2net_msg_handler), GFP_NOFS);
|
||||||
if (nmh == NULL) {
|
if (nmh == NULL) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -1918,9 +1918,9 @@ int o2net_init(void)
|
||||||
|
|
||||||
o2quo_init();
|
o2quo_init();
|
||||||
|
|
||||||
o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL);
|
o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
|
||||||
o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
|
o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
|
||||||
o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
|
o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
|
||||||
if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
|
if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
|
||||||
kfree(o2net_hand);
|
kfree(o2net_hand);
|
||||||
kfree(o2net_keep_req);
|
kfree(o2net_keep_req);
|
||||||
|
|
|
@ -920,7 +920,7 @@ static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
|
||||||
|
|
||||||
mlog_entry("%p", dlm);
|
mlog_entry("%p", dlm);
|
||||||
|
|
||||||
ctxt = kcalloc(1, sizeof(*ctxt), GFP_KERNEL);
|
ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
|
||||||
if (!ctxt) {
|
if (!ctxt) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
@ -1223,7 +1223,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
|
||||||
int i;
|
int i;
|
||||||
struct dlm_ctxt *dlm = NULL;
|
struct dlm_ctxt *dlm = NULL;
|
||||||
|
|
||||||
dlm = kcalloc(1, sizeof(*dlm), GFP_KERNEL);
|
dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
|
||||||
if (!dlm) {
|
if (!dlm) {
|
||||||
mlog_errno(-ENOMEM);
|
mlog_errno(-ENOMEM);
|
||||||
goto leave;
|
goto leave;
|
||||||
|
|
|
@ -408,13 +408,13 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64 cookie,
|
||||||
struct dlm_lock *lock;
|
struct dlm_lock *lock;
|
||||||
int kernel_allocated = 0;
|
int kernel_allocated = 0;
|
||||||
|
|
||||||
lock = kcalloc(1, sizeof(*lock), GFP_NOFS);
|
lock = kzalloc(sizeof(*lock), GFP_NOFS);
|
||||||
if (!lock)
|
if (!lock)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!lksb) {
|
if (!lksb) {
|
||||||
/* zero memory only if kernel-allocated */
|
/* zero memory only if kernel-allocated */
|
||||||
lksb = kcalloc(1, sizeof(*lksb), GFP_NOFS);
|
lksb = kzalloc(sizeof(*lksb), GFP_NOFS);
|
||||||
if (!lksb) {
|
if (!lksb) {
|
||||||
kfree(lock);
|
kfree(lock);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -1939,7 +1939,7 @@ int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
|
||||||
int ignore_higher, u8 request_from, u32 flags)
|
int ignore_higher, u8 request_from, u32 flags)
|
||||||
{
|
{
|
||||||
struct dlm_work_item *item;
|
struct dlm_work_item *item;
|
||||||
item = kcalloc(1, sizeof(*item), GFP_NOFS);
|
item = kzalloc(sizeof(*item), GFP_NOFS);
|
||||||
if (!item)
|
if (!item)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -757,7 +757,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node)
|
||||||
}
|
}
|
||||||
BUG_ON(num == dead_node);
|
BUG_ON(num == dead_node);
|
||||||
|
|
||||||
ndata = kcalloc(1, sizeof(*ndata), GFP_NOFS);
|
ndata = kzalloc(sizeof(*ndata), GFP_NOFS);
|
||||||
if (!ndata) {
|
if (!ndata) {
|
||||||
dlm_destroy_recovery_area(dlm, dead_node);
|
dlm_destroy_recovery_area(dlm, dead_node);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -842,7 +842,7 @@ int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data)
|
||||||
}
|
}
|
||||||
BUG_ON(lr->dead_node != dlm->reco.dead_node);
|
BUG_ON(lr->dead_node != dlm->reco.dead_node);
|
||||||
|
|
||||||
item = kcalloc(1, sizeof(*item), GFP_NOFS);
|
item = kzalloc(sizeof(*item), GFP_NOFS);
|
||||||
if (!item) {
|
if (!item) {
|
||||||
dlm_put(dlm);
|
dlm_put(dlm);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -1323,7 +1323,7 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data)
|
||||||
|
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS);
|
buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS);
|
||||||
item = kcalloc(1, sizeof(*item), GFP_NOFS);
|
item = kzalloc(sizeof(*item), GFP_NOFS);
|
||||||
if (!buf || !item)
|
if (!buf || !item)
|
||||||
goto leave;
|
goto leave;
|
||||||
|
|
||||||
|
|
|
@ -776,7 +776,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
*ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
||||||
if (!(*ac)) {
|
if (!(*ac)) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
|
|
@ -175,7 +175,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
|
||||||
struct buffer_head *bh = NULL;
|
struct buffer_head *bh = NULL;
|
||||||
struct ocfs2_slot_info *si;
|
struct ocfs2_slot_info *si;
|
||||||
|
|
||||||
si = kcalloc(1, sizeof(struct ocfs2_slot_info), GFP_KERNEL);
|
si = kzalloc(sizeof(struct ocfs2_slot_info), GFP_KERNEL);
|
||||||
if (!si) {
|
if (!si) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
|
|
@ -488,7 +488,7 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
|
||||||
int status;
|
int status;
|
||||||
u32 slot;
|
u32 slot;
|
||||||
|
|
||||||
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
*ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
||||||
if (!(*ac)) {
|
if (!(*ac)) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
@ -530,7 +530,7 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
*ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
||||||
if (!(*ac)) {
|
if (!(*ac)) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
@ -595,7 +595,7 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb,
|
||||||
|
|
||||||
mlog_entry_void();
|
mlog_entry_void();
|
||||||
|
|
||||||
*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
*ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
|
||||||
if (!(*ac)) {
|
if (!(*ac)) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
|
|
@ -1231,7 +1231,7 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uu
|
||||||
|
|
||||||
BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN);
|
BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN);
|
||||||
|
|
||||||
osb->uuid_str = kcalloc(1, OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL);
|
osb->uuid_str = kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL);
|
||||||
if (osb->uuid_str == NULL)
|
if (osb->uuid_str == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -1262,7 +1262,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
|
||||||
|
|
||||||
mlog_entry_void();
|
mlog_entry_void();
|
||||||
|
|
||||||
osb = kcalloc(1, sizeof(struct ocfs2_super), GFP_KERNEL);
|
osb = kzalloc(sizeof(struct ocfs2_super), GFP_KERNEL);
|
||||||
if (!osb) {
|
if (!osb) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
mlog_errno(status);
|
mlog_errno(status);
|
||||||
|
@ -1387,7 +1387,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
|
||||||
*/
|
*/
|
||||||
/* initialize our journal structure */
|
/* initialize our journal structure */
|
||||||
|
|
||||||
journal = kcalloc(1, sizeof(struct ocfs2_journal), GFP_KERNEL);
|
journal = kzalloc(sizeof(struct ocfs2_journal), GFP_KERNEL);
|
||||||
if (!journal) {
|
if (!journal) {
|
||||||
mlog(ML_ERROR, "unable to alloc journal\n");
|
mlog(ML_ERROR, "unable to alloc journal\n");
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
|
|
|
@ -479,7 +479,7 @@ static struct ocfs2_net_wait_ctxt *ocfs2_new_net_wait_ctxt(unsigned int response
|
||||||
{
|
{
|
||||||
struct ocfs2_net_wait_ctxt *w;
|
struct ocfs2_net_wait_ctxt *w;
|
||||||
|
|
||||||
w = kcalloc(1, sizeof(*w), GFP_NOFS);
|
w = kzalloc(sizeof(*w), GFP_NOFS);
|
||||||
if (!w) {
|
if (!w) {
|
||||||
mlog_errno(-ENOMEM);
|
mlog_errno(-ENOMEM);
|
||||||
goto bail;
|
goto bail;
|
||||||
|
@ -642,7 +642,7 @@ static struct ocfs2_vote_msg * ocfs2_new_vote_request(struct ocfs2_super *osb,
|
||||||
|
|
||||||
BUG_ON(!ocfs2_is_valid_vote_request(type));
|
BUG_ON(!ocfs2_is_valid_vote_request(type));
|
||||||
|
|
||||||
request = kcalloc(1, sizeof(*request), GFP_NOFS);
|
request = kzalloc(sizeof(*request), GFP_NOFS);
|
||||||
if (!request) {
|
if (!request) {
|
||||||
mlog_errno(-ENOMEM);
|
mlog_errno(-ENOMEM);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -105,7 +105,7 @@ static inline void gameport_set_phys(struct gameport *gameport,
|
||||||
|
|
||||||
static inline struct gameport *gameport_allocate_port(void)
|
static inline struct gameport *gameport_allocate_port(void)
|
||||||
{
|
{
|
||||||
struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL);
|
struct gameport *gameport = kzalloc(sizeof(struct gameport), GFP_KERNEL);
|
||||||
|
|
||||||
return gameport;
|
return gameport;
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,7 +138,7 @@ static void *relay_alloc_buf(struct rchan_buf *buf, size_t *size)
|
||||||
*/
|
*/
|
||||||
struct rchan_buf *relay_create_buf(struct rchan *chan)
|
struct rchan_buf *relay_create_buf(struct rchan *chan)
|
||||||
{
|
{
|
||||||
struct rchan_buf *buf = kcalloc(1, sizeof(struct rchan_buf), GFP_KERNEL);
|
struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ struct rchan *relay_open(const char *base_filename,
|
||||||
if (!(subbuf_size && n_subbufs))
|
if (!(subbuf_size && n_subbufs))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
chan = kcalloc(1, sizeof(struct rchan), GFP_KERNEL);
|
chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
|
||||||
if (!chan)
|
if (!chan)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -308,7 +308,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
|
||||||
|
|
||||||
serv->sv_nrpools = npools;
|
serv->sv_nrpools = npools;
|
||||||
serv->sv_pools =
|
serv->sv_pools =
|
||||||
kcalloc(sizeof(struct svc_pool), serv->sv_nrpools,
|
kcalloc(serv->sv_nrpools, sizeof(struct svc_pool),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!serv->sv_pools) {
|
if (!serv->sv_pools) {
|
||||||
kfree(serv);
|
kfree(serv);
|
||||||
|
|
Loading…
Reference in a new issue