diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-10-06 22:05:31 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-12-01 21:27:58 -0500 |
commit | daf29e9cdab7219838c6b6e82380aec3466cf379 (patch) | |
tree | b8ee26fadd65ca2c037ee34d6a061960eaec2174 /fs/ocfs2/journal.h | |
parent | 02928a71ae6da6e3e205d99e1fa1a1f598ddb62d (diff) |
ocfs2: remove unused ocfs2_handle_add_lock()
This gets us rid of a slab we no longer need, as well as removing the
majority of what's left on ocfs2_journal_handle.
ocfs2_commit_unstarted_handle() has no more real work to do, so remove that
function too.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/journal.h')
-rw-r--r-- | fs/ocfs2/journal.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index 3a16d7d88e1c..7e9c1303d633 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h | |||
@@ -133,22 +133,9 @@ static inline void ocfs2_inode_set_new(struct ocfs2_super *osb, | |||
133 | spin_unlock(&trans_inc_lock); | 133 | spin_unlock(&trans_inc_lock); |
134 | } | 134 | } |
135 | 135 | ||
136 | extern kmem_cache_t *ocfs2_lock_cache; | ||
137 | |||
138 | struct ocfs2_journal_lock { | ||
139 | struct inode *jl_inode; | ||
140 | struct list_head jl_lock_list; | ||
141 | }; | ||
142 | |||
143 | struct ocfs2_journal_handle { | 136 | struct ocfs2_journal_handle { |
144 | handle_t *k_handle; /* kernel handle. */ | 137 | handle_t *k_handle; /* kernel handle. */ |
145 | struct ocfs2_journal *journal; | 138 | struct ocfs2_journal *journal; |
146 | |||
147 | /* The following two fields are for ocfs2_handle_add_lock */ | ||
148 | int num_locks; | ||
149 | struct list_head locks; /* A bunch of locks to | ||
150 | * release on commit. This | ||
151 | * should be a list_head */ | ||
152 | }; | 139 | }; |
153 | 140 | ||
154 | /* Exported only for the journal struct init code in super.c. Do not call. */ | 141 | /* Exported only for the journal struct init code in super.c. Do not call. */ |
@@ -229,11 +216,6 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode) | |||
229 | * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data. | 216 | * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data. |
230 | * ocfs2_journal_dirty_data - Indicate that a data buffer should go out before | 217 | * ocfs2_journal_dirty_data - Indicate that a data buffer should go out before |
231 | * the current handle commits. | 218 | * the current handle commits. |
232 | * ocfs2_handle_add_lock - Sometimes we need to delay lock release | ||
233 | * until after a transaction has been completed. Use | ||
234 | * ocfs2_handle_add_lock to indicate that a lock needs | ||
235 | * to be released at the end of that handle. Locks | ||
236 | * will be released in the order that they are added. | ||
237 | */ | 219 | */ |
238 | 220 | ||
239 | /* You must always start_trans with a number of buffs > 0, but it's | 221 | /* You must always start_trans with a number of buffs > 0, but it's |
@@ -288,8 +270,6 @@ int ocfs2_journal_dirty(struct ocfs2_journal_handle *handle, | |||
288 | struct buffer_head *bh); | 270 | struct buffer_head *bh); |
289 | int ocfs2_journal_dirty_data(handle_t *handle, | 271 | int ocfs2_journal_dirty_data(handle_t *handle, |
290 | struct buffer_head *bh); | 272 | struct buffer_head *bh); |
291 | int ocfs2_handle_add_lock(struct ocfs2_journal_handle *handle, | ||
292 | struct inode *inode); | ||
293 | 273 | ||
294 | /* | 274 | /* |
295 | * Credit Macros: | 275 | * Credit Macros: |