Re: [PATCH 29/32] ucma: Convert multicast_idr to XArray

[Jason Gunthorpe <jgg@xxxxxxxx>]

On Wed, Feb 20, 2019 at 04:21:04PM -0800, Matthew Wilcox wrote:
> Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx>
> ---
>  drivers/infiniband/core/ucma.c | 26 +++++++++-----------------
>  1 file changed, 9 insertions(+), 17 deletions(-)

Applied to for-next, but I added these two hunks:

--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -104,7 +104,7 @@ struct ucma_context {
 
 struct ucma_multicast {
        struct ucma_context     *ctx;
-       int                     id;
+       u32                     id;
        int                     events_reported;
 
        u64                     uid;
@@ -234,10 +234,10 @@ static struct ucma_multicast* ucma_alloc_multicast(struct ucma_context *ctx)
        if (!mc)
                return NULL;
 
+       mc->ctx = ctx;
        if (xa_alloc(&multicast_table, &mc->id, NULL, xa_limit_32b, GFP_KERNEL))
                goto error;
 
-       mc->ctx = ctx;
        list_add_tail(&mc->list, &ctx->mc_list);
        return mc;

Thanks,
Jason