diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-11 19:07:25 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-11 19:07:25 -0400 |
| commit | 83ebade34bc1a90d0c3f77b87b940f336d075fda (patch) | |
| tree | 99b6366c52e6bec88119ae995399c985fc61e900 /fs/btrfs/ioctl.c | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 93c82d575055f1bd0277acae6f966bebafd80dd5 (diff) | |
| download | linux-stable-83ebade34bc1a90d0c3f77b87b940f336d075fda.tar.gz linux-stable-83ebade34bc1a90d0c3f77b87b940f336d075fda.tar.bz2 linux-stable-83ebade34bc1a90d0c3f77b87b940f336d075fda.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index bd88f25889f7..ef0188fb3cc4 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -596,9 +596,8 @@ again: clear_page_dirty_for_io(page); btrfs_set_extent_delalloc(inode, page_start, page_end); - - unlock_extent(io_tree, page_start, page_end, GFP_NOFS); set_page_dirty(page); + unlock_extent(io_tree, page_start, page_end, GFP_NOFS); unlock_page(page); page_cache_release(page); balance_dirty_pages_ratelimited_nr(inode->i_mapping, 1); @@ -976,7 +975,7 @@ static long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, /* punch hole in destination first */ btrfs_drop_extents(trans, root, inode, off, off + len, - off + len, 0, &hint_byte); + off + len, 0, &hint_byte, 1); /* clone data */ key.objectid = src->i_ino; |