diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-06-17 14:16:13 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-06-17 14:16:13 -0400 |
| commit | e038dca803423bb7a3fa9a162b7dcc225efe9bf9 (patch) | |
| tree | efd5d76b77f21b4a9e570f2cb5bed9f95970f7a0 /fs/btrfs/ioctl.c | |
| parent | 7585717f304f5ed005cc4ad933a69aab3efbd136 (diff) | |
| parent | ed0ca14021e5ae3147602128641aa7f742ab227c (diff) | |
| download | linux-e038dca803423bb7a3fa9a162b7dcc225efe9bf9.tar.gz linux-e038dca803423bb7a3fa9a162b7dcc225efe9bf9.tar.bz2 linux-e038dca803423bb7a3fa9a162b7dcc225efe9bf9.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus
Conflicts:
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index b793d112d1f6..a3c4751e07db 100644 --- a/fs/btrfs/ioctl.c +++ b/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, |