---

yaml --- r: 273173 b: refs/heads/master c: 6d6a435 h: refs/heads/master i: 273171: df17e63 v: v3
git-mirror · Oct 29, 2011 · 11f4f34 · 11f4f34
1 parent e032621
commit 11f4f34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7b319e39776bd0e9c0c7855b023dafed2c93d27
+refs/heads/master: 6d6a435190bdf2e04c9465cde5bdc3ac68cf11a4
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
@@ -820,8 +820,14 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
 			if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
 				goal = goal & EXT4_MAX_BLOCK_FILE_PHYS;
 
+			/*
+			 * take i_data_sem because we will test
+			 * i_delalloc_reserved_flag in ext4_mb_new_blocks
+			 */
+			down_read((&EXT4_I(inode)->i_data_sem));
 			block = ext4_new_meta_blocks(handle, inode, goal, 0,
 						     NULL, &error);
+			up_read((&EXT4_I(inode)->i_data_sem));
 			if (error)
 				goto cleanup;