public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

jbd2: fix checkpoint list cleanup

Browse source 
Unlike comments and expectation of callers journal_clean_one_cp_list()
returned 1 not only if it freed the transaction but also if it freed
some buffers in the transaction. That could make
__jbd2_journal_clean_checkpoint_list() skip processing
t_checkpoint_io_list and continue with processing the next transaction.
This is mostly a cosmetic issue since the only result is we can
sometimes free less memory than we could. But it's still worth fixing.
Fix journal_clean_one_cp_list() to return 1 only if the transaction was
really freed.

Fixes: 50849db32a
Signed-off-by: Jan Kara <jack@suse.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
This commit is contained in:
Jan Kara 2015-10-17 22:35:09 -04:00 • committed by Theodore Ts'o
parent 9c02ac9798
commit 33d14975e5
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/jbd2/checkpoint.c
View file

@ -427,7 +427,6 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
struct journal_head *last_jh; struct journal_head *last_jh;
struct journal_head *next_jh = jh; struct journal_head *next_jh = jh;
int ret; int ret;
int freed = 0;
if (!jh) if (!jh)
return 0; return 0;
@ -441,10 +440,9 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
else else
ret = __jbd2_journal_remove_checkpoint(jh) + 1; ret = __jbd2_journal_remove_checkpoint(jh) + 1;
if (!ret) if (!ret)
return freed; return 0;
if (ret == 2) if (ret == 2)
return 1; return 1;
freed = 1;
/* /*
* This function only frees up some memory * This function only frees up some memory
* if possible so we dont have an obligation * if possible so we dont have an obligation
@ -452,10 +450,10 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
* requested: * requested:
*/ */
if (need_resched()) if (need_resched())
return freed; return 0;
} while (jh != last_jh); } while (jh != last_jh);
return freed; return 0;
} }
/* /*