diff options
| author |   Josef Bacik <josef@redhat.com> | 2012-05-30 15:35:17 -0400 |
|---|---|---|
| committer |   Chris Mason <chris.mason@oracle.com> | 2012-06-14 21:29:09 -0400 |
| commit | beb42dd793193a3d4e72970bfa73cd8810f63cea (patch) | |
| tree | 8690e35c2da24fff82e61556b362cb736c8edf49 | |
| parent | Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus (diff) | |
| download | linux-dev-beb42dd793193a3d4e72970bfa73cd8810f63cea.tar.xz linux-dev-beb42dd793193a3d4e72970bfa73cd8810f63cea.zip | |
Btrfs: pass locked_page into extent_clear_unlock_delalloc if theres an error
While doing my enospc work I got a transaction abortion that resulted in a
panic when we tried to unlock_page() an already unlocked page. This is
because we aren't calling extent_clear_unlock_delalloc with the locked page
so it was unlocking all the pages in the range. This is wrong since
__extent_writepage expects to have the page locked still unless we return
*page_started as 1. This should keep us from panicing. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 92df0a5d1d94..ccd6355af73f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -830,7 +830,7 @@ static noinline int cow_file_range(struct inode *inode, if (IS_ERR(trans)) { extent_clear_unlock_delalloc(inode, &BTRFS_I(inode)->io_tree, - start, end, NULL, + start, end, locked_page, EXTENT_CLEAR_UNLOCK_PAGE | EXTENT_CLEAR_UNLOCK | EXTENT_CLEAR_DELALLOC | @@ -963,7 +963,7 @@ out: out_unlock: extent_clear_unlock_delalloc(inode, &BTRFS_I(inode)->io_tree, - start, end, NULL, + start, end, locked_page, EXTENT_CLEAR_UNLOCK_PAGE | EXTENT_CLEAR_UNLOCK | EXTENT_CLEAR_DELALLOC | |