Hi all,
After merging the xarray tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/linux/list.h:9,
from include/linux/module.h:9,
from drivers/infiniband/core/device.c:34:
drivers/infiniband/core/device.c: In function 'assign_name':
include/linux/kernel.h:22:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
#define INT_MAX ((int)(~0U>>1))
^~~~~~~~~~~~~~~
drivers/infiniband/core/device.c:591:43: note: in expansion of macro 'INT_MAX'
ret = xa_alloc(&devices, &device->index, INT_MAX, device, GFP_KERNEL);
^~~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:9: note: expected 'void *' but argument is of type 'int'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~^~~~~
drivers/infiniband/core/device.c:591:52: error: incompatible type for argument 4 of 'xa_alloc'
ret = xa_alloc(&devices, &device->index, INT_MAX, device, GFP_KERNEL);
^~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:32: note: expected 'struct xa_limit' but argument is of type 'struct ib_device *'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~~~~~~~~~~~^~~~~
In file included from include/linux/list.h:9,
from include/linux/module.h:9,
from drivers/infiniband/core/device.c:34:
include/linux/kernel.h:22:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
#define INT_MAX ((int)(~0U>>1))
^~~~~~~~~~~~~~~
drivers/infiniband/core/device.c:594:44: note: in expansion of macro 'INT_MAX'
ret = xa_alloc(&devices, &device->index, INT_MAX, device,
^~~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:9: note: expected 'void *' but argument is of type 'int'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~^~~~~
drivers/infiniband/core/device.c:594:53: error: incompatible type for argument 4 of 'xa_alloc'
ret = xa_alloc(&devices, &device->index, INT_MAX, device,
^~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:32: note: expected 'struct xa_limit' but argument is of type 'struct ib_device *'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~~~~~~~~~~~^~~~~
In file included from include/linux/list.h:9,
from include/linux/module.h:9,
from drivers/infiniband/core/device.c:34:
drivers/infiniband/core/device.c: In function 'assign_client_id':
include/linux/kernel.h:22:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
#define INT_MAX ((int)(~0U>>1))
^~~~~~~~~~~~~~~
drivers/infiniband/core/device.c:826:47: note: in expansion of macro 'INT_MAX'
ret = xa_alloc(&clients, &client->client_id, INT_MAX, client,
^~~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:9: note: expected 'void *' but argument is of type 'int'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~^~~~~
drivers/infiniband/core/device.c:826:56: error: incompatible type for argument 4 of 'xa_alloc'
ret = xa_alloc(&clients, &client->client_id, INT_MAX, client,
^~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/linux/kernfs.h:14,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/module.h:17,
from drivers/infiniband/core/device.c:34:
include/linux/xarray.h:796:32: note: expected 'struct xa_limit' but argument is of type 'struct ib_client *'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~~~~~~~~~~~^~~~~
Caused by commit
a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
interacting with commits
e59178d895af ("RDMA/devices: Use xarray to store the clients")
0df91bb67334 ("RDMA/devices: Use xarray to store the client_data")
from the rdma tree.
Its a bit of a pain modifying a published API like this :-(
I have added the following merge fixup patch for today (I assume some
of the assignments are also now redundant).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 12 Feb 2019 16:09:58 +1100
Subject: [PATCH] RDMA/devices: fix up for xa_alloc API change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/infiniband/core/device.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 3325be4f91a5..283ecc2aee89 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -588,11 +588,12 @@ static int assign_name(struct ib_device *device, const char *name)
/* Cyclically allocate a user visible ID for the device */
device->index = last_id;
- ret = xa_alloc(&devices, &device->index, INT_MAX, device, GFP_KERNEL);
+ ret = xa_alloc(&devices, &device->index, device,
+ XA_LIMIT(last_id, INT_MAX), GFP_KERNEL);
if (ret == -ENOSPC) {
device->index = 0;
- ret = xa_alloc(&devices, &device->index, INT_MAX, device,
- GFP_KERNEL);
+ ret = xa_alloc(&devices, &device->index, device,
+ XA_LIMIT(0, INT_MAX), GFP_KERNEL);
}
if (ret)
goto out;
@@ -823,8 +824,8 @@ static int assign_client_id(struct ib_client *client)
client->client_id =
list_last_entry(&client_list, struct ib_client, list)
->client_id;
- ret = xa_alloc(&clients, &client->client_id, INT_MAX, client,
- GFP_KERNEL);
+ ret = xa_alloc(&clients, &client->client_id, client,
+ XA_LIMIT(client->client_id, INT_MAX), GFP_KERNEL);
if (ret)
goto out;
--
2.20.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpBQaqrtKimL.pgp
Description: OpenPGP digital signature
