dlm: rearrange async condition return

This patch moves the return of FILE_LOCK_DEFERRED a little bit earlier
than checking afterwards again if the request was an asynchronous request.
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

fs/dlm/plock.c

@@ -149,16 +149,19 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
 		op_data->file	= file;
 
 		op->data = op_data;
+
+		send_op(op);
+		rv = FILE_LOCK_DEFERRED;
+		goto out;
 	} else {
 		op->info.owner	= (__u64)(long) fl->fl_owner;
 	}
 
 	send_op(op);
 
-	if (!op->data) {
 	rv = wait_event_interruptible(recv_wq, (op->done != 0));
 	if (rv == -ERESTARTSYS) {
-			log_debug(ls, "dlm_posix_lock: wait killed %llx",
+		log_debug(ls, "%s: wait killed %llx", __func__,
 			  (unsigned long long)number);
 		spin_lock(&ops_lock);
 		list_del(&op->list);
@@ -167,10 +170,6 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
 		do_unlock_close(ls, number, file, fl);
 		goto out;
 	}
-	} else {
-		rv = FILE_LOCK_DEFERRED;
-		goto out;
-	}
 
 	WARN_ON(!list_empty(&op->list));