lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/ucm: Simplify ib_ucm_event()

Browse Source 
Use wait_event_interruptible() instead of a more complicated
open-coded equivalent.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
This commit is contained in:
Sean Hefty
2007-04-05 10:51:05 -07:00
committed by Roland Dreier
parent d92f76448c
commit 9d41b7fdea
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/infiniband/core/ucm.c
View File

@@ -407,29 +407,18 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,
mutex_lock(&file->file_mutex); mutex_lock(&file->file_mutex);
while (list_empty(&file->events)) { while (list_empty(&file->events)) {
if (file->filp->f_flags & O_NONBLOCK) {
result = -EAGAIN;
break;
}
if (signal_pending(current)) {
result = -ERESTARTSYS;
break;
}
prepare_to_wait(&file->poll_wait, &wait, TASK_INTERRUPTIBLE);
mutex_unlock(&file->file_mutex); mutex_unlock(&file->file_mutex);
schedule();
if (file->filp->f_flags & O_NONBLOCK)
return -EAGAIN;
if (wait_event_interruptible(file->poll_wait,
!list_empty(&file->events)))
return -ERESTARTSYS;
mutex_lock(&file->file_mutex); 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); uevent = list_entry(file->events.next, struct ib_ucm_event, file_list);
if (ib_ucm_new_cm_id(uevent->resp.event)) { if (ib_ucm_new_cm_id(uevent->resp.event)) {