summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2016-08-08 15:24:02 +0200
committerIlya Dryomov <idryomov@gmail.com>2016-08-09 17:26:47 +0200
commitd8734849d8007dacaa40b31ba7319ed28077141d (patch)
treebefe83cf332d6e91354774d0958bcdafd793e7dc
parent6b6dddbe11b13bb00e0f9a1af2021e266811be85 (diff)
downloadop-kernel-dev-d8734849d8007dacaa40b31ba7319ed28077141d.zip
op-kernel-dev-d8734849d8007dacaa40b31ba7319ed28077141d.tar.gz
rbd: nuke the 32-bit pool id check
ceph_file_layout::pool_id is now s64. rbd_add_get_pool_id() and ceph_pg_poolid_by_name() both return an int, so it's bogus anyway. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Alex Elder <elder@linaro.org>
-rw-r--r--drivers/block/rbd.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 07668a6..6c6519f 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5337,15 +5337,6 @@ static ssize_t do_rbd_add(struct bus_type *bus,
}
spec->pool_id = (u64)rc;
- /* The ceph file layout needs to fit pool id in 32 bits */
-
- if (spec->pool_id > (u64)U32_MAX) {
- rbd_warn(NULL, "pool id too large (%llu > %u)",
- (unsigned long long)spec->pool_id, U32_MAX);
- rc = -EIO;
- goto err_out_client;
- }
-
rbd_dev = rbd_dev_create(rbdc, spec, rbd_opts);
if (!rbd_dev) {
rc = -ENOMEM;
OpenPOWER on IntegriCloud