Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92f7644 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

RDMA/ucma: Simplify ucma_get_event() 



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

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
parent 30c00986

drivers/infiniband/core/ucma.c

+7 −15
Original line number Diff line number Diff line
@@ -306,26 +306,18 @@ static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf, 


	mutex_lock(&file->mut);

	while (list_empty(&file->event_list)) {

		if (file->filp->f_flags & O_NONBLOCK) {

			ret = -EAGAIN;

			break;

		}

		mutex_unlock(&file->mut);



		if (signal_pending(current)) {

			ret = -ERESTARTSYS;

			break;

		}

		if (file->filp->f_flags & O_NONBLOCK)

			return -EAGAIN;



		if (wait_event_interruptible(file->poll_wait,

					     !list_empty(&file->event_list)))

			return -ERESTARTSYS;



		prepare_to_wait(&file->poll_wait, &wait, TASK_INTERRUPTIBLE);

		mutex_unlock(&file->mut);

		schedule();

		mutex_lock(&file->mut);

		finish_wait(&file->poll_wait, &wait);

	}



	if (ret)

		goto done;



	uevent = list_entry(file->event_list.next, struct ucma_event, list);



	if (uevent->resp.event == RDMA_CM_EVENT_CONNECT_REQUEST) {