From 709ae657d54e029ae6af60393bc097038b582db8 Mon Sep 17 00:00:00 2001
From: Amir Goldstein <amir73il@gmail.com>
Date: Sun, 20 Mar 2011 22:57:02 -0400
Subject: [PATCH] --- yaml --- r: 242387 b: refs/heads/master c:
 537a03103c67c4688b1e8e6671ad119aec5e2efb h: refs/heads/master i:   242385:
 2c4083a70a197745ec72211696106b5d8d792cb5   242383:
 b66831b3661227fd3d9f0a733d460bb7a3413da1 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ext4/ext4_jbd2.h | 7 -------
 trunk/fs/ext4/resize.c    | 8 ++++----
 trunk/fs/ext4/xattr.c     | 2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 221fe0eef338..aa34a5b058c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6078930263bfcdcfe4dddb2cd85254b4cf4f5c
+refs/heads/master: 537a03103c67c4688b1e8e6671ad119aec5e2efb
diff --git a/trunk/fs/ext4/ext4_jbd2.h b/trunk/fs/ext4/ext4_jbd2.h
index d8b992e658c1..e25e99bf7ee1 100644
--- a/trunk/fs/ext4/ext4_jbd2.h
+++ b/trunk/fs/ext4/ext4_jbd2.h
@@ -202,13 +202,6 @@ static inline int ext4_handle_has_enough_credits(handle_t *handle, int needed)
 	return 1;
 }
 
-static inline void ext4_journal_release_buffer(handle_t *handle,
-						struct buffer_head *bh)
-{
-	if (ext4_handle_valid(handle))
-		jbd2_journal_release_buffer(handle, bh);
-}
-
 static inline handle_t *ext4_journal_start(struct inode *inode, int nblocks)
 {
 	return ext4_journal_start_sb(inode->i_sb, nblocks);
diff --git a/trunk/fs/ext4/resize.c b/trunk/fs/ext4/resize.c
index 66fec4ee76fa..80bbc9c60c24 100644
--- a/trunk/fs/ext4/resize.c
+++ b/trunk/fs/ext4/resize.c
@@ -499,12 +499,12 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
 	return err;
 
 exit_inode:
-	/* ext4_journal_release_buffer(handle, iloc.bh); */
+	/* ext4_handle_release_buffer(handle, iloc.bh); */
 	brelse(iloc.bh);
 exit_dindj:
-	/* ext4_journal_release_buffer(handle, dind); */
+	/* ext4_handle_release_buffer(handle, dind); */
 exit_sbh:
-	/* ext4_journal_release_buffer(handle, EXT4_SB(sb)->s_sbh); */
+	/* ext4_handle_release_buffer(handle, EXT4_SB(sb)->s_sbh); */
 exit_dind:
 	brelse(dind);
 exit_bh:
@@ -586,7 +586,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
 			/*
 			int j;
 			for (j = 0; j < i; j++)
-				ext4_journal_release_buffer(handle, primary[j]);
+				ext4_handle_release_buffer(handle, primary[j]);
 			 */
 			goto exit_bh;
 		}
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index f4c03af05d69..b545ca1c459c 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -735,7 +735,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
 			int offset = (char *)s->here - bs->bh->b_data;
 
 			unlock_buffer(bs->bh);
-			jbd2_journal_release_buffer(handle, bs->bh);
+			ext4_handle_release_buffer(handle, bs->bh);
 			if (ce) {
 				mb_cache_entry_release(ce);
 				ce = NULL;