---

yaml --- r: 253812 b: refs/heads/master c: 8351583 h: refs/heads/master v: v3
git-mirror · Jun 15, 2011 · 634bbd9 · 634bbd9
1 parent a681b40
commit 634bbd9
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: 71d7aed014457147e8f71a843d5fbf03235e4a85
+refs/heads/master: 8351583e3f6e430ce8f71913909a96ad5cc6a2f6
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -482,8 +482,10 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry,
 	ret = btrfs_snap_reserve_metadata(trans, pending_snapshot);
 	BUG_ON(ret);
 
+	spin_lock(&root->fs_info->trans_lock);
 	list_add(&pending_snapshot->list,
 		 &trans->transaction->pending_snapshots);
+	spin_unlock(&root->fs_info->trans_lock);
 	if (async_transid) {
 		*async_transid = trans->transid;
 		ret = btrfs_commit_transaction_async(trans,