From 9dcac8282168dae3af34d1c91de9804e8dc34396 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 8 Sep 2010 10:09:25 +0100 Subject: [PATCH] --- yaml --- r: 211626 b: refs/heads/master c: 1fea7c25a05d388c0cdbe02cbdaf3a2e70885581 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/gfs2/lock_dlm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6c60577cdb91..1fd97d5d2b44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b5e3d5fcf0d6fce66050bd0313a7dc2ae4abc62 +refs/heads/master: 1fea7c25a05d388c0cdbe02cbdaf3a2e70885581 diff --git a/trunk/fs/gfs2/lock_dlm.c b/trunk/fs/gfs2/lock_dlm.c index 0e0470ed34c2..1c09425b45fd 100644 --- a/trunk/fs/gfs2/lock_dlm.c +++ b/trunk/fs/gfs2/lock_dlm.c @@ -42,9 +42,9 @@ static void gdlm_ast(void *arg) ret |= LM_OUT_CANCELED; goto out; case -EAGAIN: /* Try lock fails */ + case -EDEADLK: /* Deadlock detected */ goto out; - case -EINVAL: /* Invalid */ - case -ENOMEM: /* Out of memory */ + case -ETIMEDOUT: /* Canceled due to timeout */ ret |= LM_OUT_ERROR; goto out; case 0: /* Success */