X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fjbd%2Fjournal.c;h=95a628d8cac87be34e2e88054ef1580ce4f2cf27;hb=a05ba4561fa3ad8b64a27577d0d38c190f60f762;hp=7ae2c4fe506bb5bd7b2ac21c6bbf80795741361d;hpb=0481990b758628e12f4b0a9e15094e70cefc7cd1;p=powerpc.git

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 7ae2c4fe50..95a628d8ca 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -659,8 +659,8 @@ static journal_t * journal_init_common (void)
 	init_waitqueue_head(&journal->j_wait_checkpoint);
 	init_waitqueue_head(&journal->j_wait_commit);
 	init_waitqueue_head(&journal->j_wait_updates);
-	init_MUTEX(&journal->j_barrier);
-	init_MUTEX(&journal->j_checkpoint_sem);
+	mutex_init(&journal->j_barrier);
+	mutex_init(&journal->j_checkpoint_mutex);
 	spin_lock_init(&journal->j_revoke_lock);
 	spin_lock_init(&journal->j_list_lock);
 	spin_lock_init(&journal->j_state_lock);
@@ -1606,7 +1606,7 @@ int journal_blocks_per_page(struct inode *inode)
  * Simple support for retrying memory allocations.  Introduced to help to
  * debug different VM deadlock avoidance strategies. 
  */
-void * __jbd_kmalloc (const char *where, size_t size, int flags, int retry)
+void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry)
 {
 	return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0));
 }