---

yaml --- r: 346663 b: refs/heads/master c: bbe1426 h: refs/heads/master i: 346661: 85e120b 346659: a5254bc 346655: 49353f9 v: v3
git-mirror · Dec 12, 2012 · 62b3240 · 62b3240
1 parent d9c2fe8
commit 62b3240
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 315a9850da2b89c83971b26fe54a60f22bdd91ad
+refs/heads/master: bbe1426764e5dfaa57e7b12cc954acdb3fb7f94b
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
@@ -3526,8 +3526,10 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
 		struct extent_map_tree *tree = &BTRFS_I(inode)->extent_tree;
 		struct extent_map *em, *n;
 
+		write_lock(&tree->lock);
 		list_for_each_entry_safe(em, n, &tree->modified_extents, list)
 			list_del_init(&em->list);
+		write_unlock(&tree->lock);
 	}
 
 	if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) {