diff options
| author | Sean Hefty <sean.hefty@intel.com> | 2007-04-05 10:51:05 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-04-24 16:31:11 -0700 |
| commit | 9d41b7fdeadb76bd4d06c16803daffd9fcf8dc7f (patch) | |
| tree | cb2067b31bd81977ad879be1ccd2122cfde26a45 /drivers/infiniband/core | |
| parent | d92f76448c1a3e40ff3df96a653ecd83aeac6ee7 (diff) | |
| download | linux-9d41b7fdeadb76bd4d06c16803daffd9fcf8dc7f.tar.gz linux-9d41b7fdeadb76bd4d06c16803daffd9fcf8dc7f.tar.bz2 linux-9d41b7fdeadb76bd4d06c16803daffd9fcf8dc7f.zip | |
IB/ucm: Simplify ib_ucm_event()
Use wait_event_interruptible() instead of a more complicated
open-coded equivalent.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/ucm.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index ee51d79a7ad5..2586a3ee8eba 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -407,29 +407,18 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file, mutex_lock(&file->file_mutex); while (list_empty(&file->events)) { + mutex_unlock(&file->file_mutex); - if (file->filp->f_flags & O_NONBLOCK) { - result = -EAGAIN; - break; - } + if (file->filp->f_flags & O_NONBLOCK) + return -EAGAIN; - if (signal_pending(current)) { - result = -ERESTARTSYS; - break; - } + if (wait_event_interruptible(file->poll_wait, + !list_empty(&file->events))) + return -ERESTARTSYS; - prepare_to_wait(&file->poll_wait, &wait, TASK_INTERRUPTIBLE); - - mutex_unlock(&file->file_mutex); - schedule(); mutex_lock(&file->file_mutex); - - finish_wait(&file->poll_wait, &wait); } - if (result) - goto done; - uevent = list_entry(file->events.next, struct ib_ucm_event, file_list); if (ib_ucm_new_cm_id(uevent->resp.event)) { |