nfsd: fix lost nfserrno() call in nfsd_setattr()

[~andy/linux] / drivers / infiniband / hw / mlx5 / main.c

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 306534109627082c36e30f270b219e1a500c5590..9660d093f8cf14cdb686f2b432f6eca96519fb8b 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -541,6 +541,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
        struct mlx5_ib_ucontext *context;
        struct mlx5_uuar_info *uuari;
        struct mlx5_uar *uars;
+       int gross_uuars;
        int num_uars;
        int uuarn;
        int err;
@@ -559,11 +560,13 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
        if (req.total_num_uuars == 0)
                return ERR_PTR(-EINVAL);
 
-       req.total_num_uuars = ALIGN(req.total_num_uuars, MLX5_BF_REGS_PER_PAGE);
+       req.total_num_uuars = ALIGN(req.total_num_uuars,
+                                   MLX5_NON_FP_BF_REGS_PER_PAGE);
        if (req.num_low_latency_uuars > req.total_num_uuars - 1)
                return ERR_PTR(-EINVAL);
 
-       num_uars = req.total_num_uuars / MLX5_BF_REGS_PER_PAGE;
+       num_uars = req.total_num_uuars / MLX5_NON_FP_BF_REGS_PER_PAGE;
+       gross_uuars = num_uars * MLX5_BF_REGS_PER_PAGE;
        resp.qp_tab_size      = 1 << dev->mdev.caps.log_max_qp;
        resp.bf_reg_size      = dev->mdev.caps.bf_reg_size;
        resp.cache_line_size  = L1_CACHE_BYTES;
@@ -585,7 +588,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
                goto out_ctx;
        }
 
-       uuari->bitmap = kcalloc(BITS_TO_LONGS(req.total_num_uuars),
+       uuari->bitmap = kcalloc(BITS_TO_LONGS(gross_uuars),
                                sizeof(*uuari->bitmap),
                                GFP_KERNEL);
        if (!uuari->bitmap) {
@@ -595,13 +598,13 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
        /*
         * clear all fast path uuars
         */
-       for (i = 0; i < req.total_num_uuars; i++) {
+       for (i = 0; i < gross_uuars; i++) {
                uuarn = i & 3;
                if (uuarn == 2 || uuarn == 3)
                        set_bit(i, uuari->bitmap);
        }
 
-       uuari->count = kcalloc(req.total_num_uuars, sizeof(*uuari->count), GFP_KERNEL);
+       uuari->count = kcalloc(gross_uuars, sizeof(*uuari->count), GFP_KERNEL);
        if (!uuari->count) {
                err = -ENOMEM;
                goto out_bitmap;