From aa5a7073433d4d889bea34c1b1d9a51e410c9b90 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sat, 16 Oct 2010 15:19:14 +0200 Subject: [PATCH] --- yaml --- r: 218844 b: refs/heads/master c: bcf3d0bcff9c2ab5794d9a2c5f0ebc9ce63cc63f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/journal.c | 2 +- trunk/fs/jbd2/journal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75c76399fa3f..1d0f8f7937ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58c6ed38a16cd235588ed4a5ca3b213f055bc14c +refs/heads/master: bcf3d0bcff9c2ab5794d9a2c5f0ebc9ce63cc63f diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c index ac1840415a65..da1b5e4ffce1 100644 --- a/trunk/fs/jbd/journal.c +++ b/trunk/fs/jbd/journal.c @@ -441,7 +441,7 @@ int __log_start_commit(journal_t *journal, tid_t target) */ if (!tid_geq(journal->j_commit_request, target)) { /* - * We want a new commit: OK, mark the request and wakup the + * We want a new commit: OK, mark the request and wakeup the * commit thread. We do _not_ do the commit ourselves. */ diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index 0e8014ea6b94..2b9a342551b9 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -478,7 +478,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t target) */ if (!tid_geq(journal->j_commit_request, target)) { /* - * We want a new commit: OK, mark the request and wakup the + * We want a new commit: OK, mark the request and wakeup the * commit thread. We do _not_ do the commit ourselves. */