From 87b32464f21c2d0805cb6f6b15b29a816a7d49cb Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Mon, 2 Aug 2010 11:02:13 +0800 Subject: [PATCH] --- yaml --- r: 212759 b: refs/heads/master c: f9c57ada32ea3f2e12600cf274035fff063b2e0f h: refs/heads/master i: 212757: 000a0f3a636b8865c009854208c260a957d91fc3 212755: 532400beccc61f67c43708288135e787650f6e3f 212751: 02fe5df62ac5b5689db023b7404b39e6395cca9b v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/journal.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35a39259c670..080ce5a3f95c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c38881f87c21ada5609a4065cb10e3e74da0d6e +refs/heads/master: f9c57ada32ea3f2e12600cf274035fff063b2e0f diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c index 04d41dfeab9a..5787802c2d6a 100644 --- a/trunk/fs/ocfs2/journal.c +++ b/trunk/fs/ocfs2/journal.c @@ -301,7 +301,6 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb) { int status = 0; unsigned int flushed; - unsigned long old_id; struct ocfs2_journal *journal = NULL; mlog_entry_void(); @@ -326,7 +325,7 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb) goto finally; } - old_id = ocfs2_inc_trans_id(journal); + ocfs2_inc_trans_id(journal); flushed = atomic_read(&journal->j_num_trans); atomic_set(&journal->j_num_trans, 0);