Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8690bfa1 authored by Andy Grover's avatar Andy Grover
Browse files

RDS: cleanup: remove "== NULL"s and "!= NULL"s in ptr comparisons 



Favor "if (foo)" style over "if (foo != NULL)".

Signed-off-by: default avatarAndy Grover <andy.grover@oracle.com>
parent 2dc39357

net/rds/af_rds.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int rds_release(struct socket *sock) 
	struct rds_sock *rs;

	unsigned long flags;



	if (sk == NULL)

	if (!sk)

		goto out;



	rs = rds_sk_to_rs(sk);

net/rds/bind.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port) 
	do {

		if (rover == 0)

			rover++;

		if (rds_bind_tree_walk(addr, cpu_to_be16(rover), rs) == NULL) {

		if (!rds_bind_tree_walk(addr, cpu_to_be16(rover), rs)) {

			*port = cpu_to_be16(rover);

			ret = 0;

			break;
@@ -184,7 +184,7 @@ int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		goto out;



	trans = rds_trans_get_preferred(sin->sin_addr.s_addr);

	if (trans == NULL) {

	if (!trans) {

		ret = -EADDRNOTAVAIL;

		rds_remove_bound(rs);

		if (printk_ratelimit())

net/rds/cong.c

+3 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct rds_cong_map *rds_cong_from_addr(__be32 addr) 
	unsigned long flags;



	map = kzalloc(sizeof(struct rds_cong_map), GFP_KERNEL);

	if (map == NULL)

	if (!map)

		return NULL;



	map->m_addr = addr;
@@ -159,7 +159,7 @@ static struct rds_cong_map *rds_cong_from_addr(__be32 addr) 
	ret = rds_cong_tree_walk(addr, map);

	spin_unlock_irqrestore(&rds_cong_lock, flags);



	if (ret == NULL) {

	if (!ret) {

		ret = map;

		map = NULL;

	}
@@ -205,7 +205,7 @@ int rds_cong_get_maps(struct rds_connection *conn) 
	conn->c_lcong = rds_cong_from_addr(conn->c_laddr);

	conn->c_fcong = rds_cong_from_addr(conn->c_faddr);



	if (conn->c_lcong == NULL || conn->c_fcong == NULL)

	if (!(conn->c_lcong && conn->c_fcong))

		return -ENOMEM;



	return 0;

net/rds/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr, 
		goto out;



	conn = kmem_cache_zalloc(rds_conn_slab, gfp);

	if (conn == NULL) {

	if (!conn) {

		conn = ERR_PTR(-ENOMEM);

		goto out;

	}
@@ -502,7 +502,7 @@ int __init rds_conn_init(void) 
	rds_conn_slab = kmem_cache_create("rds_connection",

					  sizeof(struct rds_connection),

					  0, 0, NULL);

	if (rds_conn_slab == NULL)

	if (!rds_conn_slab)

		return -ENOMEM;



	rds_info_register_func(RDS_INFO_CONNECTIONS, rds_conn_info);

net/rds/ib_cm.c

+7 −7
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) 
	 * the rds_ibdev at all.

	 */

	rds_ibdev = ib_get_client_data(dev, &rds_ib_client);

	if (rds_ibdev == NULL) {

	if (!rds_ibdev) {

		if (printk_ratelimit())

			printk(KERN_NOTICE "RDS/IB: No client_data for device %s\n",

					dev->name);
@@ -306,7 +306,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) 
					   ic->i_send_ring.w_nr *

						sizeof(struct rds_header),

					   &ic->i_send_hdrs_dma, GFP_KERNEL);

	if (ic->i_send_hdrs == NULL) {

	if (!ic->i_send_hdrs) {

		ret = -ENOMEM;

		rdsdebug("ib_dma_alloc_coherent send failed\n");

		goto out;
@@ -316,7 +316,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) 
					   ic->i_recv_ring.w_nr *

						sizeof(struct rds_header),

					   &ic->i_recv_hdrs_dma, GFP_KERNEL);

	if (ic->i_recv_hdrs == NULL) {

	if (!ic->i_recv_hdrs) {

		ret = -ENOMEM;

		rdsdebug("ib_dma_alloc_coherent recv failed\n");

		goto out;
@@ -324,14 +324,14 @@ static int rds_ib_setup_qp(struct rds_connection *conn) 


	ic->i_ack = ib_dma_alloc_coherent(dev, sizeof(struct rds_header),

				       &ic->i_ack_dma, GFP_KERNEL);

	if (ic->i_ack == NULL) {

	if (!ic->i_ack) {

		ret = -ENOMEM;

		rdsdebug("ib_dma_alloc_coherent ack failed\n");

		goto out;

	}



	ic->i_sends = vmalloc(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work));

	if (ic->i_sends == NULL) {

	if (!ic->i_sends) {

		ret = -ENOMEM;

		rdsdebug("send allocation failed\n");

		goto out;
@@ -339,7 +339,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) 
	memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work));



	ic->i_recvs = vmalloc(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work));

	if (ic->i_recvs == NULL) {

	if (!ic->i_recvs) {

		ret = -ENOMEM;

		rdsdebug("recv allocation failed\n");

		goto out;
@@ -693,7 +693,7 @@ int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp) 


	/* XXX too lazy? */

	ic = kzalloc(sizeof(struct rds_ib_connection), GFP_KERNEL);

	if (ic == NULL)

	if (!ic)

		return -ENOMEM;



	INIT_LIST_HEAD(&ic->ib_node);