Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fix from Jason Gunthorpe:
"One fix for a bug that blktests hits when using rxe: tear down the CQ
pool before waiting for all references to go away"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/core: Fix ordering of CQ pool destruction
+4
-2
+4
-2
drivers/infiniband/core/device.c
+4
-2
drivers/infiniband/core/device.c
···
1285
1285
remove_client_context(device, cid);
1286
1286
}
1287
1287
1288
+
ib_cq_pool_destroy(device);
1289
+
1288
1290
/* Pairs with refcount_set in enable_device */
1289
1291
ib_device_put(device);
1290
1292
wait_for_completion(&device->unreg_completion);
···
1329
1327
if (ret)
1330
1328
goto out;
1331
1329
}
1330
+
1331
+
ib_cq_pool_init(device);
1332
1332
1333
1333
down_read(&clients_rwsem);
1334
1334
xa_for_each_marked (&clients, index, client, CLIENT_REGISTERED) {
···
1404
1400
goto dev_cleanup;
1405
1401
}
1406
1402
1407
-
ib_cq_pool_init(device);
1408
1403
ret = enable_device_and_get(device);
1409
1404
dev_set_uevent_suppress(&device->dev, false);
1410
1405
/* Mark for userspace that device is ready */
···
1458
1455
goto out;
1459
1456
1460
1457
disable_device(ib_dev);
1461
-
ib_cq_pool_destroy(ib_dev);
1462
1458
1463
1459
/* Expedite removing unregistered pointers from the hash table */
1464
1460
free_netdevs(ib_dev);