[openib-general] Re: [PATCH] RFC: mthca handling of signals

[Roland Dreier]

Thanks, applied along with the mthca_mcg change:

--- infiniband/hw/mthca/mthca_cmd.c     (revision 5216)
+++ infiniband/hw/mthca/mthca_cmd.c     (working copy)
@@ -199,8 +199,7 @@ static int mthca_cmd_post(struct mthca_d
 {
        int err = 0;
 
-       if (down_interruptible(&dev->cmd.hcr_sem))
-               return -EINTR;
+       down(&dev->cmd.hcr_sem);
 
        if (event) {
                unsigned long end = jiffies + GO_BIT_TIMEOUT;
@@ -255,8 +254,7 @@ static int mthca_cmd_poll(struct mthca_d
        int err = 0;
        unsigned long end;
 
-       if (down_interruptible(&dev->cmd.poll_sem))
-               return -EINTR;
+       down(&dev->cmd.poll_sem);
 
        err = mthca_cmd_post(dev, in_param,
                             out_param ? *out_param : 0,
@@ -333,8 +331,7 @@ static int mthca_cmd_wait(struct mthca_d
        int err = 0;
        struct mthca_cmd_context *context;
 
-       if (down_interruptible(&dev->cmd.event_sem))
-               return -EINTR;
+       down(&dev->cmd.event_sem);
 
        spin_lock(&dev->cmd.context_lock);
        BUG_ON(dev->cmd.free_head < 0);
--- infiniband/hw/mthca/mthca_mcg.c     (revision 5214)
+++ infiniband/hw/mthca/mthca_mcg.c     (working copy)
@@ -152,10 +152,7 @@ int mthca_multicast_attach(struct ib_qp 
                return PTR_ERR(mailbox);
        mgm = mailbox->buf;
 
-       if (down_interruptible(&dev->mcg_table.sem)) {
-               err = -EINTR;
-               goto err_sem;
-       }
+       down(&dev->mcg_table.sem);
 
        err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
        if (err)
@@ -240,7 +237,7 @@ int mthca_multicast_attach(struct ib_qp 
                mthca_free(&dev->mcg_table.alloc, index);
        }
        up(&dev->mcg_table.sem);
- err_sem:
+
        mthca_free_mailbox(dev, mailbox);
        return err;
 }
@@ -261,10 +258,7 @@ int mthca_multicast_detach(struct ib_qp 
                return PTR_ERR(mailbox);
        mgm = mailbox->buf;
 
-       if (down_interruptible(&dev->mcg_table.sem)) {
-               err = -EINTR;
-               goto err_sem;
-       }
+       down_interruptible(&dev->mcg_table.sem);
 
        err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
        if (err)
@@ -370,7 +364,7 @@ int mthca_multicast_detach(struct ib_qp 
 
  out:
        up(&dev->mcg_table.sem);
- err_sem:
+
        mthca_free_mailbox(dev, mailbox);
        return err;
 }
_______________________________________________
openib-general mailing list
openib-general@openib.org
http://openib.org/mailman/listinfo/openib-general

To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general