| commit | 0a7a0519d1789f3a222849421dbe91b6bddb88f5 | [log] [tgz] |
|---|---|---|
| author | Chris Mason <chris.mason@oracle.com> | Tue Sep 20 14:49:29 2011 -0400 |
| committer | Chris Mason <chris.mason@oracle.com> | Tue Sep 20 14:49:29 2011 -0400 |
| tree | d9fee1dae1627f24de73bf6555030b6285c7c73a | |
| parent | a66e7cc626f42de6c745963fe0d807518fa49d39 [diff] | |
| parent | b6f3409b2197e8fcedb43e6600e37b7cfbe0715b [diff] |
Merge branch 'btrfs-3.0' into for-linus
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index d11fd28..538f65a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c
@@ -2328,7 +2328,12 @@ 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;