1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c
index 851763d7d2db..dd487c100f5b 100644
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -61,7 +61,7 @@ int ipath_alloc_lkey(struct ipath_lkey_table *rkt, struct ipath_mregion *mr)
                 r = (r + 1) & (rkt->max - 1);
                 if (r == n) {
                         spin_unlock_irqrestore(&rkt->lock, flags);
-                        ipath_dbg(KERN_INFO "LKEY table full\n");
+                        ipath_dbg("LKEY table full\n");
                         ret = 0;
                         goto bail;
                 }
@@ -133,6 +133,12 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge,
          * being reversible by calling bus_to_virt().
          */
         if (sge->lkey == 0) {
+                struct ipath_pd *pd = to_ipd(qp->ibqp.pd);
+
+                if (pd->user) {
+                        ret = 0;
+                        goto bail;
+                }
                 isge->mr = NULL;
                 isge->vaddr = (void *) sge->addr;
                 isge->length = sge->length;
@@ -206,6 +212,12 @@ int ipath_rkey_ok(struct ipath_qp *qp, struct ipath_sge_state *ss,
          * (see ipath_get_dma_mr and ipath_dma.c).
          */
         if (rkey == 0) {
+                struct ipath_pd *pd = to_ipd(qp->ibqp.pd);
+
+                if (pd->user) {
+                        ret = 0;
+                        goto bail;
+                }
                 sge->mr = NULL;
                 sge->vaddr = (void *) vaddr;
                 sge->length = len;