From 04c475acd6bcad76a45dd55baba39ff44f15f3d5 Mon Sep 17 00:00:00 2001
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date: Wed, 11 Nov 2009 01:28:48 +0900
Subject: [PATCH] --- yaml --- r: 174687 b: refs/heads/master c:
 a49762fd119d191dcbb2f638a2dbc2ed53f4e2bb h: refs/heads/master i:   174685:
 92a02b5c3a8095569517b15ae76e24f9e8444b0e   174683:
 c09ea0b8cad579f89d773bf0a785a0472431f279   174679:
 bc4f4cd511e4a25561ba2fdcf651111897cb4290   174671:
 582246f9b26d4db0717cffbf33b17616b17e2398   174655:
 fa3ae19710a6f8b05ef1968b256c78a373b63c2d v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nilfs2/inode.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f801702e715a..ed4b84cfc828 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2073e78575e3690ea3cce67b11b7b1de8e85fd3
+refs/heads/master: a49762fd119d191dcbb2f638a2dbc2ed53f4e2bb
diff --git a/trunk/fs/nilfs2/inode.c b/trunk/fs/nilfs2/inode.c
index 2a0a5a3ac134..412b25a7d345 100644
--- a/trunk/fs/nilfs2/inode.c
+++ b/trunk/fs/nilfs2/inode.c
@@ -525,7 +525,6 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh)
 
 	raw_inode = nilfs_ifile_map_inode(sbi->s_ifile, ino, ibh);
 
-	/* The buffer is guarded with lock_buffer() by the caller */
 	if (test_and_clear_bit(NILFS_I_NEW, &ii->i_state))
 		memset(raw_inode, 0, NILFS_MDT(sbi->s_ifile)->mi_entry_size);
 	set_bit(NILFS_I_INODE_DIRTY, &ii->i_state);
@@ -745,9 +744,7 @@ int nilfs_mark_inode_dirty(struct inode *inode)
 			      "failed to reget inode block.\n");
 		return err;
 	}
-	lock_buffer(ibh);
 	nilfs_update_inode(inode, ibh);
-	unlock_buffer(ibh);
 	nilfs_mdt_mark_buffer_dirty(ibh);
 	nilfs_mdt_mark_dirty(sbi->s_ifile);
 	brelse(ibh);