rbd: nuke the 32-bit pool id check
authorIlya Dryomov <idryomov@gmail.com>
Mon, 8 Aug 2016 13:24:02 +0000 (15:24 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 9 Aug 2016 15:26:47 +0000 (17:26 +0200)
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>
drivers/block/rbd.c

index 07668a6f0607705c1659f4493ebde32d7e388cac..6c6519f6492a4198c78cae1eaad5e33e03efd2d9 100644 (file)
@@ -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;