diff options
| author |   Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /fs/btrfs/ioctl.c | |
| parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7 (diff) | |
| parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
| download | linux-dev-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz linux-dev-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index aa97dfe8ae70..73c0be77b4bd 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -690,7 +690,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, if (ret) goto dec_and_free; - btrfs_wait_ordered_extents(root, -1); + btrfs_wait_ordered_extents(root, -1, 0, (u64)-1); btrfs_init_block_rsv(&pending_snapshot->block_rsv, BTRFS_BLOCK_RSV_TEMP); |