diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-09-20 20:49:29 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-09-20 20:49:29 +0200 |
| commit | 0a7a0519d1789f3a222849421dbe91b6bddb88f5 (patch) | |
| tree | d9fee1dae1627f24de73bf6555030b6285c7c73a /fs | |
| parent | Btrfs: only clear the need lookup flag after the dentry is setup (diff) | |
| parent | Btrfs: reserve sufficient space for ioctl clone (diff) | |
| download | linux-0a7a0519d1789f3a222849421dbe91b6bddb88f5.tar.xz linux-0a7a0519d1789f3a222849421dbe91b6bddb88f5.zip | |
Merge branch 'btrfs-3.0' into for-linus
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index d11fd28efa6a..538f65a79ec5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2328,7 +2328,12 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, else new_key.offset = destoff; - trans = btrfs_start_transaction(root, 1); + /* + * 1 - adjusting old extent (we may have to split it) + * 1 - add new extent + * 1 - inode update + */ + trans = btrfs_start_transaction(root, 3); if (IS_ERR(trans)) { ret = PTR_ERR(trans); goto out; |