aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd/commit.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
committerJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /fs/jbd/commit.c
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/jbd/commit.c')
-rw-r--r--fs/jbd/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index da871ee084d3..69b180459463 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -362,7 +362,7 @@ void journal_commit_transaction(journal_t *journal)
362 * we do not require it to remember exactly which old buffers it 362 * we do not require it to remember exactly which old buffers it
363 * has reserved. This is consistent with the existing behaviour 363 * has reserved. This is consistent with the existing behaviour
364 * that multiple journal_get_write_access() calls to the same 364 * that multiple journal_get_write_access() calls to the same
365 * buffer are perfectly permissable. 365 * buffer are perfectly permissible.
366 */ 366 */
367 while (commit_transaction->t_reserved_list) { 367 while (commit_transaction->t_reserved_list) {
368 jh = commit_transaction->t_reserved_list; 368 jh = commit_transaction->t_reserved_list;