aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/acl.c2
-rw-r--r--fs/gfs2/bmap.c2
-rw-r--r--fs/gfs2/daemon.c2
-rw-r--r--fs/gfs2/dir.c2
-rw-r--r--fs/gfs2/eaops.c2
-rw-r--r--fs/gfs2/eattr.c2
-rw-r--r--fs/gfs2/glock.c2
-rw-r--r--fs/gfs2/glops.c2
-rw-r--r--fs/gfs2/inode.c2
-rw-r--r--fs/gfs2/lm.c2
-rw-r--r--fs/gfs2/lm_interface.h273
-rw-r--r--fs/gfs2/locking.c3
-rw-r--r--fs/gfs2/locking/dlm/lock_dlm.h2
-rw-r--r--fs/gfs2/locking/nolock/main.c3
-rw-r--r--fs/gfs2/log.c2
-rw-r--r--fs/gfs2/lops.c2
-rw-r--r--fs/gfs2/main.c2
-rw-r--r--fs/gfs2/meta_io.c2
-rw-r--r--fs/gfs2/mount.c2
-rw-r--r--fs/gfs2/ops_address.c2
-rw-r--r--fs/gfs2/ops_dentry.c2
-rw-r--r--fs/gfs2/ops_export.c2
-rw-r--r--fs/gfs2/ops_file.c2
-rw-r--r--fs/gfs2/ops_fstype.c2
-rw-r--r--fs/gfs2/ops_inode.c2
-rw-r--r--fs/gfs2/ops_super.c2
-rw-r--r--fs/gfs2/ops_vm.c2
-rw-r--r--fs/gfs2/quota.c2
-rw-r--r--fs/gfs2/recovery.c2
-rw-r--r--fs/gfs2/rgrp.c2
-rw-r--r--fs/gfs2/super.c2
-rw-r--r--fs/gfs2/sys.c2
-rw-r--r--fs/gfs2/trans.c2
-rw-r--r--fs/gfs2/util.c2
34 files changed, 33 insertions, 308 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index d846b5ad1d87..3123fc071233 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -15,9 +15,9 @@
15#include <linux/posix_acl.h> 15#include <linux/posix_acl.h>
16#include <linux/posix_acl_xattr.h> 16#include <linux/posix_acl_xattr.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "acl.h" 22#include "acl.h"
23#include "eaops.h" 23#include "eaops.h"
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index bd5bc887ef9b..19b9bfc10349 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/crc32.h> 16#include <linux/crc32.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "bmap.h" 21#include "bmap.h"
22#include "glock.h" 22#include "glock.h"
diff --git a/fs/gfs2/daemon.c b/fs/gfs2/daemon.c
index a2a07c41845d..a9908cd78cd9 100644
--- a/fs/gfs2/daemon.c
+++ b/fs/gfs2/daemon.c
@@ -15,9 +15,9 @@
15#include <linux/kthread.h> 15#include <linux/kthread.h>
16#include <linux/delay.h> 16#include <linux/delay.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "daemon.h" 22#include "daemon.h"
23#include "glock.h" 23#include "glock.h"
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index f3dbda216caf..739028688270 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -61,9 +61,9 @@
61#include <linux/gfs2_ondisk.h> 61#include <linux/gfs2_ondisk.h>
62#include <linux/crc32.h> 62#include <linux/crc32.h>
63#include <linux/vmalloc.h> 63#include <linux/vmalloc.h>
64#include <linux/lm_interface.h>
64 65
65#include "gfs2.h" 66#include "gfs2.h"
66#include "lm_interface.h"
67#include "incore.h" 67#include "incore.h"
68#include "dir.h" 68#include "dir.h"
69#include "glock.h" 69#include "glock.h"
diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index adb898ceaa18..1a7877fe7393 100644
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -14,10 +14,10 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/xattr.h> 15#include <linux/xattr.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/lm_interface.h>
17#include <asm/uaccess.h> 18#include <asm/uaccess.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "acl.h" 22#include "acl.h"
23#include "eaops.h" 23#include "eaops.h"
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index d7b92fba6998..698942ec7c99 100644
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -14,10 +14,10 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/xattr.h> 15#include <linux/xattr.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/lm_interface.h>
17#include <asm/uaccess.h> 18#include <asm/uaccess.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "acl.h" 22#include "acl.h"
23#include "eaops.h" 23#include "eaops.h"
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 64a1676e5f48..f98694e7d668 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -18,10 +18,10 @@
18#include <linux/kallsyms.h> 18#include <linux/kallsyms.h>
19#include <linux/gfs2_ondisk.h> 19#include <linux/gfs2_ondisk.h>
20#include <linux/list.h> 20#include <linux/list.h>
21#include <linux/lm_interface.h>
21#include <asm/uaccess.h> 22#include <asm/uaccess.h>
22 23
23#include "gfs2.h" 24#include "gfs2.h"
24#include "lm_interface.h"
25#include "incore.h" 25#include "incore.h"
26#include "glock.h" 26#include "glock.h"
27#include "glops.h" 27#include "glops.h"
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index d3aef74ea5d4..9c046dbf4729 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -13,9 +13,9 @@
13#include <linux/completion.h> 13#include <linux/completion.h>
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/lm_interface.h>
16 17
17#include "gfs2.h" 18#include "gfs2.h"
18#include "lm_interface.h"
19#include "incore.h" 19#include "incore.h"
20#include "bmap.h" 20#include "bmap.h"
21#include "glock.h" 21#include "glock.h"
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0d010f0654d9..b9e4bcb3bf1e 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -16,9 +16,9 @@
16#include <linux/sort.h> 16#include <linux/sort.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/crc32.h> 18#include <linux/crc32.h>
19#include <linux/lm_interface.h>
19 20
20#include "gfs2.h" 21#include "gfs2.h"
21#include "lm_interface.h"
22#include "incore.h" 22#include "incore.h"
23#include "acl.h" 23#include "acl.h"
24#include "bmap.h" 24#include "bmap.h"
diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index 4e23aa5ef75d..2109fc4791d4 100644
--- a/fs/gfs2/lm.c
+++ b/fs/gfs2/lm.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "glock.h" 21#include "glock.h"
22#include "lm.h" 22#include "lm.h"
diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
deleted file mode 100644
index 1418fdc9ac02..000000000000
--- a/fs/gfs2/lm_interface.h
+++ /dev/null
@@ -1,273 +0,0 @@
1/*
2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
3 * Copyright (C) 2004-2006 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#ifndef __LM_INTERFACE_DOT_H__
11#define __LM_INTERFACE_DOT_H__
12
13
14typedef void (*lm_callback_t) (void *ptr, unsigned int type, void *data);
15
16/*
17 * lm_mount() flags
18 *
19 * LM_MFLAG_SPECTATOR
20 * GFS is asking to join the filesystem's lockspace, but it doesn't want to
21 * modify the filesystem. The lock module shouldn't assign a journal to the FS
22 * mount. It shouldn't send recovery callbacks to the FS mount. If the node
23 * dies or withdraws, all locks can be wiped immediately.
24 */
25
26#define LM_MFLAG_SPECTATOR 0x00000001
27
28/*
29 * lm_lockstruct flags
30 *
31 * LM_LSFLAG_LOCAL
32 * The lock_nolock module returns LM_LSFLAG_LOCAL to GFS, indicating that GFS
33 * can make single-node optimizations.
34 */
35
36#define LM_LSFLAG_LOCAL 0x00000001
37
38/*
39 * lm_lockname types
40 */
41
42#define LM_TYPE_RESERVED 0x00
43#define LM_TYPE_NONDISK 0x01
44#define LM_TYPE_INODE 0x02
45#define LM_TYPE_RGRP 0x03
46#define LM_TYPE_META 0x04
47#define LM_TYPE_IOPEN 0x05
48#define LM_TYPE_FLOCK 0x06
49#define LM_TYPE_PLOCK 0x07
50#define LM_TYPE_QUOTA 0x08
51#define LM_TYPE_JOURNAL 0x09
52
53/*
54 * lm_lock() states
55 *
56 * SHARED is compatible with SHARED, not with DEFERRED or EX.
57 * DEFERRED is compatible with DEFERRED, not with SHARED or EX.
58 */
59
60#define LM_ST_UNLOCKED 0
61#define LM_ST_EXCLUSIVE 1
62#define LM_ST_DEFERRED 2
63#define LM_ST_SHARED 3
64
65/*
66 * lm_lock() flags
67 *
68 * LM_FLAG_TRY
69 * Don't wait to acquire the lock if it can't be granted immediately.
70 *
71 * LM_FLAG_TRY_1CB
72 * Send one blocking callback if TRY is set and the lock is not granted.
73 *
74 * LM_FLAG_NOEXP
75 * GFS sets this flag on lock requests it makes while doing journal recovery.
76 * These special requests should not be blocked due to the recovery like
77 * ordinary locks would be.
78 *
79 * LM_FLAG_ANY
80 * A SHARED request may also be granted in DEFERRED, or a DEFERRED request may
81 * also be granted in SHARED. The preferred state is whichever is compatible
82 * with other granted locks, or the specified state if no other locks exist.
83 *
84 * LM_FLAG_PRIORITY
85 * Override fairness considerations. Suppose a lock is held in a shared state
86 * and there is a pending request for the deferred state. A shared lock
87 * request with the priority flag would be allowed to bypass the deferred
88 * request and directly join the other shared lock. A shared lock request
89 * without the priority flag might be forced to wait until the deferred
90 * requested had acquired and released the lock.
91 */
92
93#define LM_FLAG_TRY 0x00000001
94#define LM_FLAG_TRY_1CB 0x00000002
95#define LM_FLAG_NOEXP 0x00000004
96#define LM_FLAG_ANY 0x00000008
97#define LM_FLAG_PRIORITY 0x00000010
98
99/*
100 * lm_lock() and lm_async_cb return flags
101 *
102 * LM_OUT_ST_MASK
103 * Masks the lower two bits of lock state in the returned value.
104 *
105 * LM_OUT_CACHEABLE
106 * The lock hasn't been released so GFS can continue to cache data for it.
107 *
108 * LM_OUT_CANCELED
109 * The lock request was canceled.
110 *
111 * LM_OUT_ASYNC
112 * The result of the request will be returned in an LM_CB_ASYNC callback.
113 */
114
115#define LM_OUT_ST_MASK 0x00000003
116#define LM_OUT_CACHEABLE 0x00000004
117#define LM_OUT_CANCELED 0x00000008
118#define LM_OUT_ASYNC 0x00000080
119#define LM_OUT_ERROR 0x00000100
120
121/*
122 * lm_callback_t types
123 *
124 * LM_CB_NEED_E LM_CB_NEED_D LM_CB_NEED_S
125 * Blocking callback, a remote node is requesting the given lock in
126 * EXCLUSIVE, DEFERRED, or SHARED.
127 *
128 * LM_CB_NEED_RECOVERY
129 * The given journal needs to be recovered.
130 *
131 * LM_CB_DROPLOCKS
132 * Reduce the number of cached locks.
133 *
134 * LM_CB_ASYNC
135 * The given lock has been granted.
136 */
137
138#define LM_CB_NEED_E 257
139#define LM_CB_NEED_D 258
140#define LM_CB_NEED_S 259
141#define LM_CB_NEED_RECOVERY 260
142#define LM_CB_DROPLOCKS 261
143#define LM_CB_ASYNC 262
144
145/*
146 * lm_recovery_done() messages
147 */
148
149#define LM_RD_GAVEUP 308
150#define LM_RD_SUCCESS 309
151
152
153struct lm_lockname {
154 u64 ln_number;
155 unsigned int ln_type;
156};
157
158#define lm_name_equal(name1, name2) \
159 (((name1)->ln_number == (name2)->ln_number) && \
160 ((name1)->ln_type == (name2)->ln_type)) \
161
162struct lm_async_cb {
163 struct lm_lockname lc_name;
164 int lc_ret;
165};
166
167struct lm_lockstruct;
168
169struct lm_lockops {
170 const char *lm_proto_name;
171
172 /*
173 * Mount/Unmount
174 */
175
176 int (*lm_mount) (char *table_name, char *host_data,
177 lm_callback_t cb, void *cb_data,
178 unsigned int min_lvb_size, int flags,
179 struct lm_lockstruct *lockstruct,
180 struct kobject *fskobj);
181
182 void (*lm_others_may_mount) (void *lockspace);
183
184 void (*lm_unmount) (void *lockspace);
185
186 void (*lm_withdraw) (void *lockspace);
187
188 /*
189 * Lock oriented operations
190 */
191
192 int (*lm_get_lock) (void *lockspace, struct lm_lockname *name, void **lockp);
193
194 void (*lm_put_lock) (void *lock);
195
196 unsigned int (*lm_lock) (void *lock, unsigned int cur_state,
197 unsigned int req_state, unsigned int flags);
198
199 unsigned int (*lm_unlock) (void *lock, unsigned int cur_state);
200
201 void (*lm_cancel) (void *lock);
202
203 int (*lm_hold_lvb) (void *lock, char **lvbp);
204 void (*lm_unhold_lvb) (void *lock, char *lvb);
205
206 /*
207 * Posix Lock oriented operations
208 */
209
210 int (*lm_plock_get) (void *lockspace, struct lm_lockname *name,
211 struct file *file, struct file_lock *fl);
212
213 int (*lm_plock) (void *lockspace, struct lm_lockname *name,
214 struct file *file, int cmd, struct file_lock *fl);
215
216 int (*lm_punlock) (void *lockspace, struct lm_lockname *name,
217 struct file *file, struct file_lock *fl);
218
219 /*
220 * Client oriented operations
221 */
222
223 void (*lm_recovery_done) (void *lockspace, unsigned int jid,
224 unsigned int message);
225
226 struct module *lm_owner;
227};
228
229/*
230 * lm_mount() return values
231 *
232 * ls_jid - the journal ID this node should use
233 * ls_first - this node is the first to mount the file system
234 * ls_lvb_size - size in bytes of lock value blocks
235 * ls_lockspace - lock module's context for this file system
236 * ls_ops - lock module's functions
237 * ls_flags - lock module features
238 */
239
240struct lm_lockstruct {
241 unsigned int ls_jid;
242 unsigned int ls_first;
243 unsigned int ls_lvb_size;
244 void *ls_lockspace;
245 const struct lm_lockops *ls_ops;
246 int ls_flags;
247};
248
249/*
250 * Lock module bottom interface. A lock module makes itself available to GFS
251 * with these functions.
252 */
253
254int gfs2_register_lockproto(const struct lm_lockops *proto);
255void gfs2_unregister_lockproto(const struct lm_lockops *proto);
256
257/*
258 * Lock module top interface. GFS calls these functions when mounting or
259 * unmounting a file system.
260 */
261
262int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data,
263 lm_callback_t cb, void *cb_data,
264 unsigned int min_lvb_size, int flags,
265 struct lm_lockstruct *lockstruct,
266 struct kobject *fskobj);
267
268void gfs2_unmount_lockproto(struct lm_lockstruct *lockstruct);
269
270void gfs2_withdraw_lockproto(struct lm_lockstruct *lockstruct);
271
272#endif /* __LM_INTERFACE_DOT_H__ */
273
diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
index 65eca48b2eae..663fee728783 100644
--- a/fs/gfs2/locking.c
+++ b/fs/gfs2/locking.c
@@ -16,8 +16,7 @@
16#include <linux/kmod.h> 16#include <linux/kmod.h>
17#include <linux/fs.h> 17#include <linux/fs.h>
18#include <linux/delay.h> 18#include <linux/delay.h>
19 19#include <linux/lm_interface.h>
20#include "lm_interface.h"
21 20
22struct lmh_wrapper { 21struct lmh_wrapper {
23 struct list_head lw_list; 22 struct list_head lw_list;
diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index 3a45c020d01e..33af707a4d3f 100644
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -26,7 +26,7 @@
26#include <net/sock.h> 26#include <net/sock.h>
27 27
28#include <linux/dlm.h> 28#include <linux/dlm.h>
29#include "../../lm_interface.h" 29#include <linux/lm_interface.h>
30 30
31/* 31/*
32 * Internally, we prefix things with gdlm_ and GDLM_ (for gfs-dlm) since a 32 * Internally, we prefix things with gdlm_ and GDLM_ (for gfs-dlm) since a
diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index 7b263fc6c273..acfbc941f319 100644
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -14,8 +14,7 @@
14#include <linux/types.h> 14#include <linux/types.h>
15#include <linux/fs.h> 15#include <linux/fs.h>
16#include <linux/smp_lock.h> 16#include <linux/smp_lock.h>
17 17#include <linux/lm_interface.h>
18#include "../../lm_interface.h"
19 18
20struct nolock_lockspace { 19struct nolock_lockspace {
21 unsigned int nl_lvb_size; 20 unsigned int nl_lvb_size;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index ab341cd0a76a..08b80b263ade 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/crc32.h> 16#include <linux/crc32.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "bmap.h" 21#include "bmap.h"
22#include "glock.h" 22#include "glock.h"
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index f8f6d4b56a01..e44d245d51d4 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -13,9 +13,9 @@
13#include <linux/completion.h> 13#include <linux/completion.h>
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/lm_interface.h>
16 17
17#include "gfs2.h" 18#include "gfs2.h"
18#include "lm_interface.h"
19#include "incore.h" 19#include "incore.h"
20#include "glock.h" 20#include "glock.h"
21#include "log.h" 21#include "log.h"
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index d2867988cc34..7903be735fe9 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -15,10 +15,10 @@
15#include <linux/module.h> 15#include <linux/module.h>
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
18#include <asm/atomic.h> 19#include <asm/atomic.h>
19 20
20#include "gfs2.h" 21#include "gfs2.h"
21#include "lm_interface.h"
22#include "incore.h" 22#include "incore.h"
23#include "ops_fstype.h" 23#include "ops_fstype.h"
24#include "sys.h" 24#include "sys.h"
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 6af3521339fc..a5630ec6c045 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -18,9 +18,9 @@
18#include <linux/swap.h> 18#include <linux/swap.h>
19#include <linux/delay.h> 19#include <linux/delay.h>
20#include <linux/gfs2_ondisk.h> 20#include <linux/gfs2_ondisk.h>
21#include <linux/lm_interface.h>
21 22
22#include "gfs2.h" 23#include "gfs2.h"
23#include "lm_interface.h"
24#include "incore.h" 24#include "incore.h"
25#include "glock.h" 25#include "glock.h"
26#include "glops.h" 26#include "glops.h"
diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index 257c4a179dc6..ef3092e29607 100644
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -13,9 +13,9 @@
13#include <linux/completion.h> 13#include <linux/completion.h>
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/lm_interface.h>
16 17
17#include "gfs2.h" 18#include "gfs2.h"
18#include "lm_interface.h"
19#include "incore.h" 19#include "incore.h"
20#include "mount.h" 20#include "mount.h"
21#include "sys.h" 21#include "sys.h"
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 7cd53d118c89..91ec8080eeb2 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -17,9 +17,9 @@
17#include <linux/mpage.h> 17#include <linux/mpage.h>
18#include <linux/fs.h> 18#include <linux/fs.h>
19#include <linux/gfs2_ondisk.h> 19#include <linux/gfs2_ondisk.h>
20#include <linux/lm_interface.h>
20 21
21#include "gfs2.h" 22#include "gfs2.h"
22#include "lm_interface.h"
23#include "incore.h" 23#include "incore.h"
24#include "bmap.h" 24#include "bmap.h"
25#include "glock.h" 25#include "glock.h"
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index fa6ceffc7d82..00041b1b8025 100644
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -15,9 +15,9 @@
15#include <linux/smp_lock.h> 15#include <linux/smp_lock.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/crc32.h> 17#include <linux/crc32.h>
18#include <linux/lm_interface.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "dir.h" 22#include "dir.h"
23#include "glock.h" 23#include "glock.h"
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index 470e8829e7f4..86127d93bd35 100644
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/crc32.h> 16#include <linux/crc32.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "dir.h" 21#include "dir.h"
22#include "glock.h" 22#include "glock.h"
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index b551074a3c98..80f3ff0bba7b 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -22,10 +22,10 @@
22#include <linux/ext2_fs.h> 22#include <linux/ext2_fs.h>
23#include <linux/crc32.h> 23#include <linux/crc32.h>
24#include <linux/iflags.h> 24#include <linux/iflags.h>
25#include <linux/lm_interface.h>
25#include <asm/uaccess.h> 26#include <asm/uaccess.h>
26 27
27#include "gfs2.h" 28#include "gfs2.h"
28#include "lm_interface.h"
29#include "incore.h" 29#include "incore.h"
30#include "bmap.h" 30#include "bmap.h"
31#include "dir.h" 31#include "dir.h"
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index e8b7a1ae163b..e32a6b242e0c 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -17,9 +17,9 @@
17#include <linux/namei.h> 17#include <linux/namei.h>
18#include <linux/mount.h> 18#include <linux/mount.h>
19#include <linux/gfs2_ondisk.h> 19#include <linux/gfs2_ondisk.h>
20#include <linux/lm_interface.h>
20 21
21#include "gfs2.h" 22#include "gfs2.h"
22#include "lm_interface.h"
23#include "incore.h" 23#include "incore.h"
24#include "daemon.h" 24#include "daemon.h"
25#include "glock.h" 25#include "glock.h"
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 2f38313b4bd5..bb2ef6a86533 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -19,10 +19,10 @@
19#include <linux/posix_acl.h> 19#include <linux/posix_acl.h>
20#include <linux/gfs2_ondisk.h> 20#include <linux/gfs2_ondisk.h>
21#include <linux/crc32.h> 21#include <linux/crc32.h>
22#include <linux/lm_interface.h>
22#include <asm/uaccess.h> 23#include <asm/uaccess.h>
23 24
24#include "gfs2.h" 25#include "gfs2.h"
25#include "lm_interface.h"
26#include "incore.h" 26#include "incore.h"
27#include "acl.h" 27#include "acl.h"
28#include "bmap.h" 28#include "bmap.h"
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 975e93b7992e..f9538849c418 100644
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -19,9 +19,9 @@
19#include <linux/delay.h> 19#include <linux/delay.h>
20#include <linux/gfs2_ondisk.h> 20#include <linux/gfs2_ondisk.h>
21#include <linux/crc32.h> 21#include <linux/crc32.h>
22#include <linux/lm_interface.h>
22 23
23#include "gfs2.h" 24#include "gfs2.h"
24#include "lm_interface.h"
25#include "incore.h" 25#include "incore.h"
26#include "glock.h" 26#include "glock.h"
27#include "inode.h" 27#include "inode.h"
diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
index 3b3463144126..5453d2947ab3 100644
--- a/fs/gfs2/ops_vm.c
+++ b/fs/gfs2/ops_vm.c
@@ -15,9 +15,9 @@
15#include <linux/mm.h> 15#include <linux/mm.h>
16#include <linux/pagemap.h> 16#include <linux/pagemap.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "bmap.h" 22#include "bmap.h"
23#include "glock.h" 23#include "glock.h"
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index bc9ad058d20e..c5eb6c646177 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -44,9 +44,9 @@
44#include <linux/sort.h> 44#include <linux/sort.h>
45#include <linux/fs.h> 45#include <linux/fs.h>
46#include <linux/gfs2_ondisk.h> 46#include <linux/gfs2_ondisk.h>
47#include <linux/lm_interface.h>
47 48
48#include "gfs2.h" 49#include "gfs2.h"
49#include "lm_interface.h"
50#include "incore.h" 50#include "incore.h"
51#include "bmap.h" 51#include "bmap.h"
52#include "glock.h" 52#include "glock.h"
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 130e9fbf9692..518f9128137e 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/crc32.h> 16#include <linux/crc32.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "bmap.h" 21#include "bmap.h"
22#include "glock.h" 22#include "glock.h"
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 7a5ab817ad9c..113b4ace6893 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/fs.h> 15#include <linux/fs.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "glock.h" 21#include "glock.h"
22#include "glops.h" 22#include "glops.h"
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f1d07d987c7b..fe207a3e206e 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -15,9 +15,9 @@
15#include <linux/crc32.h> 15#include <linux/crc32.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/bio.h> 17#include <linux/bio.h>
18#include <linux/lm_interface.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "bmap.h" 22#include "bmap.h"
23#include "dir.h" 23#include "dir.h"
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index c9b23084918f..0e0ec988f731 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -15,10 +15,10 @@
15#include <linux/module.h> 15#include <linux/module.h>
16#include <linux/kobject.h> 16#include <linux/kobject.h>
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
18#include <asm/uaccess.h> 19#include <asm/uaccess.h>
19 20
20#include "gfs2.h" 21#include "gfs2.h"
21#include "lm_interface.h"
22#include "incore.h" 22#include "incore.h"
23#include "lm.h" 23#include "lm.h"
24#include "sys.h" 24#include "sys.h"
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index acf840160d5f..f8dabf8446bb 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -14,9 +14,9 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/gfs2_ondisk.h> 15#include <linux/gfs2_ondisk.h>
16#include <linux/kallsyms.h> 16#include <linux/kallsyms.h>
17#include <linux/lm_interface.h>
17 18
18#include "gfs2.h" 19#include "gfs2.h"
19#include "lm_interface.h"
20#include "incore.h" 20#include "incore.h"
21#include "glock.h" 21#include "glock.h"
22#include "log.h" 22#include "log.h"
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index d72eb8addc7a..196c604faadc 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -14,10 +14,10 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/crc32.h> 15#include <linux/crc32.h>
16#include <linux/gfs2_ondisk.h> 16#include <linux/gfs2_ondisk.h>
17#include <linux/lm_interface.h>
17#include <asm/uaccess.h> 18#include <asm/uaccess.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
20#include "lm_interface.h"
21#include "incore.h" 21#include "incore.h"
22#include "glock.h" 22#include "glock.h"
23#include "lm.h" 23#include "lm.h"