1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 2033a928d34d..be1edb04b085 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -369,10 +369,11 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
         regd_buf = &iser_task->rdma_regd[cmd_dir];
 
         aligned_len = iser_data_buf_aligned_len(mem, ibdev);
-        if (aligned_len != mem->dma_nents) {
+        if (aligned_len != mem->dma_nents ||
+            (!ib_conn->fmr_pool && mem->dma_nents > 1)) {
                 iscsi_conn->fmr_unalign_cnt++;
-                iser_warn("rdma alignment violation %d/%d aligned\n",
-                         aligned_len, mem->size);
+                iser_warn("rdma alignment violation (%d/%d aligned) or FMR not supported\n",
+                          aligned_len, mem->size);
                 iser_data_buf_dump(mem, ibdev);
 
                 /* unmap the command data before accessing it */
@@ -404,7 +405,7 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
         } else { /* use FMR for multiple dma entries */
                 iser_page_vec_build(mem, ib_conn->page_vec, ibdev);
                 err = iser_reg_page_vec(ib_conn, ib_conn->page_vec, &regd_buf->reg);
-                if (err) {
+                if (err && err != -EAGAIN) {
                         iser_data_buf_dump(mem, ibdev);
                         iser_err("mem->dma_nents = %d (dlength = 0x%x)\n",
                                  mem->dma_nents,