diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2010-11-30 10:33:04 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-11-30 10:33:04 -0500 |
commit | 0b1246e6776c79719ff4a3afd9c38fba99b99d5a (patch) | |
tree | 23f029c525e33e856f3d890054309589323d7892 /fs | |
parent | 921169ca2f7c8a0a2ccda2ce33c465dfe3ae30ef (diff) |
GFS2: Remove duplicate #defines from glock.h
There are a number of duplicated #defines in glock.h
plus one which is unused. This removes the extra
definitions.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/glock.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index ba6865c6e7e0..691851ceb615 100644 --- a/fs/gfs2/glock.h +++ b/fs/gfs2/glock.h | |||
@@ -87,7 +87,6 @@ enum { | |||
87 | #define GL_ASYNC 0x00000040 | 87 | #define GL_ASYNC 0x00000040 |
88 | #define GL_EXACT 0x00000080 | 88 | #define GL_EXACT 0x00000080 |
89 | #define GL_SKIP 0x00000100 | 89 | #define GL_SKIP 0x00000100 |
90 | #define GL_ATIME 0x00000200 | ||
91 | #define GL_NOCACHE 0x00000400 | 90 | #define GL_NOCACHE 0x00000400 |
92 | 91 | ||
93 | /* | 92 | /* |
@@ -126,19 +125,6 @@ struct lm_lockops { | |||
126 | const match_table_t *lm_tokens; | 125 | const match_table_t *lm_tokens; |
127 | }; | 126 | }; |
128 | 127 | ||
129 | #define LM_FLAG_TRY 0x00000001 | ||
130 | #define LM_FLAG_TRY_1CB 0x00000002 | ||
131 | #define LM_FLAG_NOEXP 0x00000004 | ||
132 | #define LM_FLAG_ANY 0x00000008 | ||
133 | #define LM_FLAG_PRIORITY 0x00000010 | ||
134 | |||
135 | #define GL_ASYNC 0x00000040 | ||
136 | #define GL_EXACT 0x00000080 | ||
137 | #define GL_SKIP 0x00000100 | ||
138 | #define GL_NOCACHE 0x00000400 | ||
139 | |||
140 | #define GLR_TRYFAILED 13 | ||
141 | |||
142 | extern struct workqueue_struct *gfs2_delete_workqueue; | 128 | extern struct workqueue_struct *gfs2_delete_workqueue; |
143 | static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *gl) | 129 | static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *gl) |
144 | { | 130 | { |