Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

This was done entirely with mindless brute force, using

    git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
        xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'

to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.

Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.

For the same reason the 'flex' versions will be done as a separate
conversion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

10 files changed, 27 insertions, 27 deletions

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 242101f269c3..7072556b38f6 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1195,7 +1195,7 @@ void smc_fill_gid_list(struct smc_link_group *lgr,
 	memset(gidlist, 0, sizeof(*gidlist));
 	memcpy(gidlist->list[gidlist->len++], known_gid, SMC_GID_SIZE);
 
-	alt_ini = kzalloc_obj(*alt_ini, GFP_KERNEL);
+	alt_ini = kzalloc_obj(*alt_ini);
 	if (!alt_ini)
 		goto out;
 
@@ -1522,7 +1522,7 @@ static int __smc_connect(struct smc_sock *smc)
 		return smc_connect_decline_fallback(smc, SMC_CLC_DECL_IPSEC,
 						    version);
 
-	ini = kzalloc_obj(*ini, GFP_KERNEL);
+	ini = kzalloc_obj(*ini);
 	if (!ini)
 		return smc_connect_decline_fallback(smc, SMC_CLC_DECL_MEM,
 						    version);
@@ -2470,7 +2470,7 @@ static void smc_listen_work(struct work_struct *work)
 	/* do inband token exchange -
 	 * wait for and receive SMC Proposal CLC message
 	 */
-	buf = kzalloc_obj(*buf, GFP_KERNEL);
+	buf = kzalloc_obj(*buf);
 	if (!buf) {
 		rc = SMC_CLC_DECL_MEM;
 		goto out_decl;
@@ -2490,7 +2490,7 @@ static void smc_listen_work(struct work_struct *work)
 		goto out_decl;
 	}
 
-	ini = kzalloc_obj(*ini, GFP_KERNEL);
+	ini = kzalloc_obj(*ini);
 	if (!ini) {
 		rc = SMC_CLC_DECL_MEM;
 		goto out_decl;
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index 992fd2b9f05f..c38fc7bf0a7e 100644
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -88,7 +88,7 @@ static int smc_clc_ueid_add(char *ueid)
 		return -EINVAL;
 
 	/* add a new ueid entry to the ueid table if there isn't one */
-	new_ueid = kzalloc_obj(*new_ueid, GFP_KERNEL);
+	new_ueid = kzalloc_obj(*new_ueid);
 	if (!new_ueid)
 		return -ENOMEM;
 	memcpy(new_ueid->eid, ueid, SMC_MAX_EID_LEN);
@@ -861,7 +861,7 @@ int smc_clc_send_proposal(struct smc_sock *smc, struct smc_init_info *ini)
 	struct kvec vec[8];
 	struct msghdr msg;
 
-	pclc = kzalloc_obj(*pclc, GFP_KERNEL);
+	pclc = kzalloc_obj(*pclc);
 	if (!pclc)
 		return -ENOMEM;
 
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 50d01a573042..e2d083daeb7e 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -905,7 +905,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)
 		}
 	}
 
-	lgr = kzalloc_obj(*lgr, GFP_KERNEL);
+	lgr = kzalloc_obj(*lgr);
 	if (!lgr) {
 		rc = SMC_CLC_DECL_MEM;
 		goto ism_put_vlan;
@@ -2320,7 +2320,7 @@ static struct smc_buf_desc *smcr_new_buf_create(struct smc_link_group *lgr,
 	struct smc_buf_desc *buf_desc;
 
 	/* try to alloc a new buffer */
-	buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+	buf_desc = kzalloc_obj(*buf_desc);
 	if (!buf_desc)
 		return ERR_PTR(-ENOMEM);
 
@@ -2394,7 +2394,7 @@ static struct smc_buf_desc *smcd_new_buf_create(struct smc_link_group *lgr,
 	int rc;
 
 	/* try to alloc a new DMB */
-	buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+	buf_desc = kzalloc_obj(*buf_desc);
 	if (!buf_desc)
 		return ERR_PTR(-ENOMEM);
 	if (is_dmb) {
@@ -2578,7 +2578,7 @@ int smcd_buf_attach(struct smc_sock *smc)
 	struct smc_buf_desc *buf_desc;
 	int rc;
 
-	buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+	buf_desc = kzalloc_obj(*buf_desc);
 	if (!buf_desc)
 		return -ENOMEM;
 
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index 5a1384126f91..9bb495707445 100644
--- a/net/smc/smc_ib.c
+++ b/net/smc/smc_ib.c
@@ -944,7 +944,7 @@ static int smc_ib_add_dev(struct ib_device *ibdev)
 	if (ibdev->node_type != RDMA_NODE_IB_CA)
 		return -EOPNOTSUPP;
 
-	smcibdev = kzalloc_obj(*smcibdev, GFP_KERNEL);
+	smcibdev = kzalloc_obj(*smcibdev);
 	if (!smcibdev)
 		return -ENOMEM;
 
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 4ee7362e91c5..e0dba2c7b6e3 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -142,7 +142,7 @@ int smc_ism_get_vlan(struct smcd_dev *smcd, unsigned short vlanid)
 		return -EOPNOTSUPP;
 
 	/* create new vlan entry, in case we need it */
-	new_vlan = kzalloc_obj(*new_vlan, GFP_KERNEL);
+	new_vlan = kzalloc_obj(*new_vlan);
 	if (!new_vlan)
 		return -ENOMEM;
 	new_vlan->vlanid = vlanid;
@@ -467,10 +467,10 @@ static struct smcd_dev *smcd_alloc_dev(const char *name, int max_dmbs)
 {
 	struct smcd_dev *smcd;
 
-	smcd = kzalloc_obj(*smcd, GFP_KERNEL);
+	smcd = kzalloc_obj(*smcd);
 	if (!smcd)
 		return NULL;
-	smcd->conn = kzalloc_objs(struct smc_connection *, max_dmbs, GFP_KERNEL);
+	smcd->conn = kzalloc_objs(struct smc_connection *, max_dmbs);
 	if (!smcd->conn)
 		goto free_smcd;
 
diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index f82d5fc7f068..954b2ff1815c 100644
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -1040,7 +1040,7 @@ int smc_llc_cli_add_link(struct smc_link *link, struct smc_llc_qentry *qentry)
 	if (!llc->qp_mtu)
 		goto out_reject;
 
-	ini = kzalloc_obj(*ini, GFP_KERNEL);
+	ini = kzalloc_obj(*ini);
 	if (!ini) {
 		rc = -ENOMEM;
 		goto out_reject;
@@ -1180,7 +1180,7 @@ static void smc_llc_cli_add_link_invite(struct smc_link *link,
 	if (lgr->type == SMC_LGR_SINGLE && lgr->max_links <= 1)
 		goto out;
 
-	ini = kzalloc_obj(*ini, GFP_KERNEL);
+	ini = kzalloc_obj(*ini);
 	if (!ini)
 		goto out;
 
@@ -1419,7 +1419,7 @@ int smc_llc_srv_add_link(struct smc_link *link,
 	    req_qentry->msg.raw.hdr.common.llc_type == SMC_LLC_REQ_ADD_LINK)
 		send_req_add_link_resp = true;
 
-	ini = kzalloc_obj(*ini, GFP_KERNEL);
+	ini = kzalloc_obj(*ini);
 	if (!ini) {
 		rc = -ENOMEM;
 		goto out;
diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
index 239da54ba01c..63e286e2dfaa 100644
--- a/net/smc/smc_pnet.c
+++ b/net/smc/smc_pnet.c
@@ -368,7 +368,7 @@ static int smc_pnet_add_eth(struct smc_pnettable *pnettable, struct net *net,
 
 	/* add a new netdev entry to the pnet table if there isn't one */
 	rc = -ENOMEM;
-	new_pe = kzalloc_obj(*new_pe, GFP_KERNEL);
+	new_pe = kzalloc_obj(*new_pe);
 	if (!new_pe)
 		goto out_put;
 	new_pe->type = SMC_PNET_ETH;
@@ -445,7 +445,7 @@ static int smc_pnet_add_ib(struct smc_pnettable *pnettable, char *ib_name,
 		return -EEXIST;
 
 	/* add a new ib entry to the pnet table if there isn't one */
-	new_pe = kzalloc_obj(*new_pe, GFP_KERNEL);
+	new_pe = kzalloc_obj(*new_pe);
 	if (!new_pe)
 		return -ENOMEM;
 	new_pe->type = SMC_PNET_IB;
@@ -747,7 +747,7 @@ static int smc_pnet_add_pnetid(struct net *net, u8 *pnetid)
 	struct smc_net *sn = net_generic(net, smc_net_id);
 	struct smc_pnetids_ndev_entry *pe, *pi;
 
-	pe = kzalloc_obj(*pe, GFP_KERNEL);
+	pe = kzalloc_obj(*pe);
 	if (!pe)
 		return -ENOMEM;
 
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index bde9bc1ed4c0..d833e36f7fd4 100644
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -161,17 +161,17 @@ static int smc_rx_splice(struct pipe_inode_info *pipe, char *src, size_t len,
 	nr_pages = !lgr->is_smcd && smc->conn.rmb_desc->is_vm ?
 		   PAGE_ALIGN(len + offset) / PAGE_SIZE : 1;
 
-	pages = kzalloc_objs(*pages, nr_pages, GFP_KERNEL);
+	pages = kzalloc_objs(*pages, nr_pages);
 	if (!pages)
 		goto out;
-	partial = kzalloc_objs(*partial, nr_pages, GFP_KERNEL);
+	partial = kzalloc_objs(*partial, nr_pages);
 	if (!partial)
 		goto out_page;
-	priv = kzalloc_objs(*priv, nr_pages, GFP_KERNEL);
+	priv = kzalloc_objs(*priv, nr_pages);
 	if (!priv)
 		goto out_part;
 	for (i = 0; i < nr_pages; i++) {
-		priv[i] = kzalloc_obj(**priv, GFP_KERNEL);
+		priv[i] = kzalloc_obj(**priv);
 		if (!priv[i])
 			goto out_priv;
 	}
diff --git a/net/smc/smc_stats.c b/net/smc/smc_stats.c
index aeb462dbbb2c..59db611821f6 100644
--- a/net/smc/smc_stats.c
+++ b/net/smc/smc_stats.c
@@ -20,7 +20,7 @@
 
 int smc_stats_init(struct net *net)
 {
-	net->smc.fback_rsn = kzalloc_obj(*net->smc.fback_rsn, GFP_KERNEL);
+	net->smc.fback_rsn = kzalloc_obj(*net->smc.fback_rsn);
 	if (!net->smc.fback_rsn)
 		goto err_fback;
 	net->smc.smc_stats = alloc_percpu(struct smc_stats);
@@ -285,7 +285,7 @@ int smc_nl_get_stats(struct sk_buff *skb,
 	attrs = nla_nest_start(skb, SMC_GEN_STATS);
 	if (!attrs)
 		goto errnest;
-	stats = kzalloc_obj(*stats, GFP_KERNEL);
+	stats = kzalloc_obj(*stats);
 	if (!stats)
 		goto erralloc;
 	size = sizeof(*stats) / sizeof(u64);
diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
index bad014f353b3..b423abb4210d 100644
--- a/net/smc/smc_wr.c
+++ b/net/smc/smc_wr.c
@@ -787,7 +787,7 @@ int smc_wr_alloc_link_mem(struct smc_link *link)
 		goto no_mem_wr_tx_pends;
 
 	if (link->lgr->smc_version == SMC_V2) {
-		link->wr_tx_v2_ib = kzalloc_obj(*link->wr_tx_v2_ib, GFP_KERNEL);
+		link->wr_tx_v2_ib = kzalloc_obj(*link->wr_tx_v2_ib);
 		if (!link->wr_tx_v2_ib)
 			goto no_mem_tx_compl;
 		link->wr_tx_v2_sge = kzalloc_obj(*link->wr_tx_v2_sge,