Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / net / rds / ib_frmr.c

diff --git a/net/rds/ib_frmr.c b/net/rds/ib_frmr.c
index d921adc62765dba0bbaec9a7489227348405082e..48332a6ed7383c51def7402dcfef1e581fa677f7 100644 (file)
--- a/net/rds/ib_frmr.c
+++ b/net/rds/ib_frmr.c
@@ -104,14 +104,15 @@ static int rds_ib_post_reg_frmr(struct rds_ib_mr *ibmr)
        struct rds_ib_frmr *frmr = &ibmr->u.frmr;
        struct ib_send_wr *failed_wr;
        struct ib_reg_wr reg_wr;
-       int ret;
+       int ret, off = 0;
 
        while (atomic_dec_return(&ibmr->ic->i_fastreg_wrs) <= 0) {
                atomic_inc(&ibmr->ic->i_fastreg_wrs);
                cpu_relax();
        }
 
-       ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_len, 0, PAGE_SIZE);
+       ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_len,
+                               &off, PAGE_SIZE);
        if (unlikely(ret != ibmr->sg_len))
                return ret < 0 ? ret : -EINVAL;
 
@@ -240,8 +241,8 @@ static int rds_ib_post_inv(struct rds_ib_mr *ibmr)
        if (frmr->fr_state != FRMR_IS_INUSE)
                goto out;
 
-       while (atomic_dec_return(&ibmr->ic->i_fastreg_wrs) <= 0) {
-               atomic_inc(&ibmr->ic->i_fastreg_wrs);
+       while (atomic_dec_return(&ibmr->ic->i_fastunreg_wrs) <= 0) {
+               atomic_inc(&ibmr->ic->i_fastunreg_wrs);
                cpu_relax();
        }
 
@@ -260,7 +261,7 @@ static int rds_ib_post_inv(struct rds_ib_mr *ibmr)
        if (unlikely(ret)) {
                frmr->fr_state = FRMR_IS_STALE;
                frmr->fr_inv = false;
-               atomic_inc(&ibmr->ic->i_fastreg_wrs);
+               atomic_inc(&ibmr->ic->i_fastunreg_wrs);
                pr_err("RDS/IB: %s returned error(%d)\n", __func__, ret);
                goto out;
        }
@@ -288,9 +289,10 @@ void rds_ib_mr_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc)
        if (frmr->fr_inv) {
                frmr->fr_state = FRMR_IS_FREE;
                frmr->fr_inv = false;
+               atomic_inc(&ic->i_fastreg_wrs);
+       } else {
+               atomic_inc(&ic->i_fastunreg_wrs);
        }
-
-       atomic_inc(&ic->i_fastreg_wrs);
 }
 
 void rds_ib_unreg_frmr(struct list_head *list, unsigned int *nfreed,