Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Correct max_srq_wr returned from mlx4_ib_query_device()
  IPoIB/cm: Remove dead definition of struct ipoib_cm_id
  IPoIB/cm: Fix interoperability when MTU doesn't match
  IPoIB/cm: Initialize RX before moving QP to RTR
  IB/umem: Fix possible hang on process exit

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index b4aec5103c99..d40652a80151 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -225,13 +225,15 @@ void ib_umem_release(struct ib_umem *umem)
          * up here and not be able to take the mmap_sem.  In that case
          * we defer the vm_locked accounting to the system workqueue.
          */
-        if (context->closing && !down_write_trylock(&mm->mmap_sem)) {
-                INIT_WORK(&umem->work, ib_umem_account);
-                umem->mm   = mm;
-                umem->diff = diff;
-
-                schedule_work(&umem->work);
-                return;
+        if (context->closing) {
+                if (!down_write_trylock(&mm->mmap_sem)) {
+                        INIT_WORK(&umem->work, ib_umem_account);
+                        umem->mm   = mm;
+                        umem->diff = diff;
+
+                        schedule_work(&umem->work);
+                        return;
+                }
         } else
                 down_write(&mm->mmap_sem);