From f60c00d786090c4fd9df624138ae3039bc5a781e Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Thu, 5 Oct 2006 13:54:39 -0700 Subject: [PATCH] --- yaml --- r: 42366 b: refs/heads/master c: 01ddf1e186b3b12b38c9e44912e0fd6a1cbc882b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/journal.c | 7 +------ trunk/fs/ocfs2/journal.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 31b058d15e9c..83eb9279d47e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5a923d1ba648bfb3cc922c66981fc8e3280f57f +refs/heads/master: 01ddf1e186b3b12b38c9e44912e0fd6a1cbc882b diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c index fd9734def551..e26cd0ca5176 100644 --- a/trunk/fs/ocfs2/journal.c +++ b/trunk/fs/ocfs2/journal.c @@ -124,7 +124,6 @@ struct ocfs2_journal_handle *ocfs2_alloc_handle(struct ocfs2_super *osb) return NULL; } - retval->max_buffs = 0; retval->num_locks = 0; retval->k_handle = NULL; @@ -172,8 +171,6 @@ struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb, goto done_free; } - handle->max_buffs = max_buffs; - down_read(&osb->journal->j_trans_barrier); /* actually start the transaction now */ @@ -353,9 +350,7 @@ int ocfs2_extend_trans(struct ocfs2_journal_handle *handle, mlog_errno(status); goto bail; } - handle->max_buffs = nblocks; - } else - handle->max_buffs += nblocks; + } status = 0; bail: diff --git a/trunk/fs/ocfs2/journal.h b/trunk/fs/ocfs2/journal.h index 2f3a6acdac45..35ae835e9698 100644 --- a/trunk/fs/ocfs2/journal.h +++ b/trunk/fs/ocfs2/journal.h @@ -144,7 +144,6 @@ struct ocfs2_journal_handle { handle_t *k_handle; /* kernel handle. */ struct ocfs2_journal *journal; u32 flags; /* see flags below. */ - int max_buffs; /* Buffs reserved by this handle */ /* The following two fields are for ocfs2_handle_add_lock */ int num_locks;