aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/journal.c7
-rw-r--r--fs/ocfs2/journal.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index fd9734def551..e26cd0ca5176 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -124,7 +124,6 @@ struct ocfs2_journal_handle *ocfs2_alloc_handle(struct ocfs2_super *osb)
124 return NULL; 124 return NULL;
125 } 125 }
126 126
127 retval->max_buffs = 0;
128 retval->num_locks = 0; 127 retval->num_locks = 0;
129 retval->k_handle = NULL; 128 retval->k_handle = NULL;
130 129
@@ -172,8 +171,6 @@ struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
172 goto done_free; 171 goto done_free;
173 } 172 }
174 173
175 handle->max_buffs = max_buffs;
176
177 down_read(&osb->journal->j_trans_barrier); 174 down_read(&osb->journal->j_trans_barrier);
178 175
179 /* actually start the transaction now */ 176 /* actually start the transaction now */
@@ -353,9 +350,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle,
353 mlog_errno(status); 350 mlog_errno(status);
354 goto bail; 351 goto bail;
355 } 352 }
356 handle->max_buffs = nblocks; 353 }
357 } else
358 handle->max_buffs += nblocks;
359 354
360 status = 0; 355 status = 0;
361bail: 356bail:
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index 2f3a6acdac45..35ae835e9698 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -144,7 +144,6 @@ struct ocfs2_journal_handle {
144 handle_t *k_handle; /* kernel handle. */ 144 handle_t *k_handle; /* kernel handle. */
145 struct ocfs2_journal *journal; 145 struct ocfs2_journal *journal;
146 u32 flags; /* see flags below. */ 146 u32 flags; /* see flags below. */
147 int max_buffs; /* Buffs reserved by this handle */
148 147
149 /* The following two fields are for ocfs2_handle_add_lock */ 148 /* The following two fields are for ocfs2_handle_add_lock */
150 int num_locks; 149 int num_locks;