---

yaml --- r: 174687 b: refs/heads/master c: a49762f h: refs/heads/master i: 174685: 92a02b5 174683: c09ea0b 174679: bc4f4cd 174671: 582246f 174655: fa3ae19 v: v3
git-mirror · Nov 20, 2009 · 04c475a · 04c475a
1 parent 7b98910
commit 04c475a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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);