Re: [PATCH 60/62] sctp: convert to idr_alloc()

[Vlad Yasevich]

On 02/02/2013 08:21 PM, Tejun Heo wrote:
> Convert to the much saner new idr interface.
>
> Only compile tested.
>
> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Vlad Yasevich <vyasevich@xxxxxxxxx>
> Cc: Sridhar Samudrala <sri@xxxxxxxxxx>
> Cc: Neil Horman <nhorman@xxxxxxxxxxxxx>
> Cc: linux-sctp@xxxxxxxxxxxxxxx
> ---
> This patch depends on an earlier idr changes and I think it would be
> best to route these together through -mm.  Please holler if there's
> any objection.  Thanks.
>
>   net/sctp/associola.c | 27 +++++++++++----------------
>   1 file changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/net/sctp/associola.c b/net/sctp/associola.c
> index b45ed1f..a9962e4 100644
> --- a/net/sctp/associola.c
> +++ b/net/sctp/associola.c
> @@ -1592,32 +1592,27 @@ int sctp_assoc_lookup_laddr(struct sctp_association *asoc,
>   /* Set an association id for a given association */
>   int sctp_assoc_set_id(struct sctp_association *asoc, gfp_t gfp)
>   {
> -	int assoc_id;
> -	int error = 0;
> +	int ret;
>
>   	/* If the id is already assigned, keep it. */
>   	if (asoc->assoc_id)
> -		return error;
> -retry:
> -	if (unlikely(!idr_pre_get(&sctp_assocs_id, gfp)))
> -		return -ENOMEM;
> +		return 0;
>
> +	idr_preload(gfp);
>   	spin_lock_bh(&sctp_assocs_id_lock);
> -	error = idr_get_new_above(&sctp_assocs_id, (void *)asoc,
> -				    idr_low, &assoc_id);
> -	if (!error) {
> -		idr_low = assoc_id + 1;
> +	ret = idr_alloc(&sctp_assocs_id, asoc, idr_low, 0, GFP_NOWAIT);
> +	if (ret >= 0) {

In SCTP, association id is not allowed to be 0, so we have to treat 0 as 
an error.

-vlad

> +		idr_low = ret + 1;
>   		if (idr_low == INT_MAX)
>   			idr_low = 1;
>   	}
>   	spin_unlock_bh(&sctp_assocs_id_lock);
> -	if (error == -EAGAIN)
> -		goto retry;
> -	else if (error)
> -		return error;
> +	idr_preload_end();
> +	if (ret < 0)
> +		return ret;
>
> -	asoc->assoc_id = (sctp_assoc_t) assoc_id;
> -	return error;
> +	asoc->assoc_id = (sctp_assoc_t)ret;
> +	return 0;
>   }
>
>   /* Free the ASCONF queue */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/