X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fblock%2Fcpqarray.c;h=b71334b968b68250f4fee5e6f85f3260bbc072e2;hb=d4430d62fa77208824a37fe6f85ab2831d274769;hp=09c14341e6e39582c4230d71ec8bddb384e26610;hpb=7022b15e2a9f878fd5184586064c63352c3dd225;p=mirror_ubuntu-zesty-kernel.git

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 09c14341e6e3..b71334b968b6 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -195,9 +195,9 @@ static inline ctlr_info_t *get_host(struct gendisk *disk)
 
 static struct block_device_operations ida_fops  = {
 	.owner		= THIS_MODULE,
-	.open		= ida_open,
-	.release	= ida_release,
-	.ioctl		= ida_ioctl,
+	.__open		= ida_open,
+	.__release	= ida_release,
+	.__ioctl		= ida_ioctl,
 	.getgeo		= ida_getgeo,
 	.revalidate_disk= ida_revalidate,
 };
@@ -424,7 +424,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
 		hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t),
 		&(hba[i]->cmd_pool_dhandle));
 	hba[i]->cmd_pool_bits = kcalloc(
-		(NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG, sizeof(unsigned long),
+		DIV_ROUND_UP(NR_CMDS, BITS_PER_LONG), sizeof(unsigned long),
 		GFP_KERNEL);
 
 	if (!hba[i]->cmd_pool_bits || !hba[i]->cmd_pool)