diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2009-01-12 05:43:39 -0500 |
---|---|---|
committer | Steven Whitehouse <steve@dolmen.chygwyn.com> | 2009-03-24 07:21:14 -0400 |
commit | f057f6cdf64175db1151b1f5d110e29904f119a1 (patch) | |
tree | 582dbf358e351f64977620c29ebf772d693b1948 /fs/gfs2/locking/dlm/thread.c | |
parent | 22077f57dec8fcbeb1112b35313961c0902ff038 (diff) |
GFS2: Merge lock_dlm module into GFS2
This is the big patch that I've been working on for some time
now. There are many reasons for wanting to make this change
such as:
o Reducing overhead by eliminating duplicated fields between structures
o Simplifcation of the code (reduces the code size by a fair bit)
o The locking interface is now the DLM interface itself as proposed
some time ago.
o Fewer lookups of glocks when processing replies from the DLM
o Fewer memory allocations/deallocations for each glock
o Scope to do further optimisations in the future (but this patch is
more than big enough for now!)
Please note that (a) this patch relates to the lock_dlm module and
not the DLM itself, that is still a separate module; and (b) that
we retain the ability to build GFS2 as a standalone single node
filesystem with out requiring the DLM.
This patch needs a lot of testing, hence my keeping it I restarted
my -git tree after the last merge window. That way, this has the maximum
exposure before its merged. This is (modulo a few minor bug fixes) the
same patch that I've been posting on and off the the last three months
and its passed a number of different tests so far.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking/dlm/thread.c')
-rw-r--r-- | fs/gfs2/locking/dlm/thread.c | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c deleted file mode 100644 index 38823efd698c..000000000000 --- a/fs/gfs2/locking/dlm/thread.c +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | ||
3 | * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. | ||
4 | * | ||
5 | * This copyrighted material is made available to anyone wishing to use, | ||
6 | * modify, copy, or redistribute it subject to the terms and conditions | ||
7 | * of the GNU General Public License version 2. | ||
8 | */ | ||
9 | |||
10 | #include "lock_dlm.h" | ||
11 | |||
12 | static inline int no_work(struct gdlm_ls *ls) | ||
13 | { | ||
14 | int ret; | ||
15 | |||
16 | spin_lock(&ls->async_lock); | ||
17 | ret = list_empty(&ls->submit); | ||
18 | spin_unlock(&ls->async_lock); | ||
19 | |||
20 | return ret; | ||
21 | } | ||
22 | |||
23 | static int gdlm_thread(void *data) | ||
24 | { | ||
25 | struct gdlm_ls *ls = (struct gdlm_ls *) data; | ||
26 | struct gdlm_lock *lp = NULL; | ||
27 | |||
28 | while (!kthread_should_stop()) { | ||
29 | wait_event_interruptible(ls->thread_wait, | ||
30 | !no_work(ls) || kthread_should_stop()); | ||
31 | |||
32 | spin_lock(&ls->async_lock); | ||
33 | |||
34 | if (!list_empty(&ls->submit)) { | ||
35 | lp = list_entry(ls->submit.next, struct gdlm_lock, | ||
36 | delay_list); | ||
37 | list_del_init(&lp->delay_list); | ||
38 | spin_unlock(&ls->async_lock); | ||
39 | gdlm_do_lock(lp); | ||
40 | spin_lock(&ls->async_lock); | ||
41 | } | ||
42 | spin_unlock(&ls->async_lock); | ||
43 | } | ||
44 | |||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | int gdlm_init_threads(struct gdlm_ls *ls) | ||
49 | { | ||
50 | struct task_struct *p; | ||
51 | int error; | ||
52 | |||
53 | p = kthread_run(gdlm_thread, ls, "lock_dlm"); | ||
54 | error = IS_ERR(p); | ||
55 | if (error) { | ||
56 | log_error("can't start lock_dlm thread %d", error); | ||
57 | return error; | ||
58 | } | ||
59 | ls->thread = p; | ||
60 | |||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | void gdlm_release_threads(struct gdlm_ls *ls) | ||
65 | { | ||
66 | kthread_stop(ls->thread); | ||
67 | } | ||
68 | |||