Re: [patch 2/3] ib_srpt: checking NULL instead of ERR_PTR

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 2011-11-04 at 21:27 +0300, Dan Carpenter wrote:
> transport_init_session() and target_fabric_configfs_init() don't
> return NULL pointers, they only return ERR_PTRs or valid pointers.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

Thanks for catching this breakage.  It appears that are a few other
locations outside of ib_srpt where return checking for these two
functions needs to be fixed as well.  I'll fix this up shortly.

Thanks for the review!

--nab

> 
> diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
> index 937b4bc..f27b8da 100644
> --- a/drivers/infiniband/ulp/srpt/ib_srpt.c
> +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
> @@ -2602,10 +2602,10 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
>  	}
>  
>  	ch->sess = transport_init_session();
> -	if (!ch->sess) {
> +	if (IS_ERR(ch->sess)) {
>  		rej->reason = __constant_cpu_to_be32(
>  				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
>  		pr_debug("Failed to create session\n");
>  		goto deregister_session;
>  	}
>  	ch->sess->se_node_acl = &nacl->nacl;
> @@ -4019,10 +4020,10 @@ static int __init srpt_init_module(void)
>  	spin_lock_init(&srpt_dev_lock);
>  	INIT_LIST_HEAD(&srpt_dev_list);
>  
> -	ret = -ENODEV;
>  	srpt_target = target_fabric_configfs_init(THIS_MODULE, "srpt");
> -	if (!srpt_target) {
> +	if (IS_ERR(srpt_target)) {
>  		printk(KERN_ERR "couldn't register\n");
> +		ret = PTR_ERR(srpt_target);
>  		goto out;
>  	}
>  


--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux