فهرست منبع

GFS2: Update handling of DLM return codes to match reality

GFS2's idea of which return codes it needs to handle was based
upon those listed in dlm.h. Those didn't cover all the possible
codes and listed some which never happen. This updates GFS2 to
handle all the codes which can actually be returned from the
DLM under various circumstances.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Steven Whitehouse 14 سال پیش
والد
کامیت
1fea7c25a0
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      fs/gfs2/lock_dlm.c

+ 2 - 2
fs/gfs2/lock_dlm.c

@@ -42,9 +42,9 @@ static void gdlm_ast(void *arg)
 		ret |= LM_OUT_CANCELED;
 		ret |= LM_OUT_CANCELED;
 		goto out;
 		goto out;
 	case -EAGAIN: /* Try lock fails */
 	case -EAGAIN: /* Try lock fails */
+	case -EDEADLK: /* Deadlock detected */
 		goto out;
 		goto out;
-	case -EINVAL: /* Invalid */
-	case -ENOMEM: /* Out of memory */
+	case -ETIMEDOUT: /* Canceled due to timeout */
 		ret |= LM_OUT_ERROR;
 		ret |= LM_OUT_ERROR;
 		goto out;
 		goto out;
 	case 0: /* Success */
 	case 0: /* Success */