diff options
| author | Chris Mason | 2011-07-27 22:13:10 +0200 |
|---|---|---|
| committer | Chris Mason | 2011-07-27 22:18:13 +0200 |
| commit | ff95acb6733d41a8d45feb0e18b96df25e610e78 (patch) | |
| tree | e20983c579c9095970aefa9cb176a9df0654d1e4 /fs/btrfs/relocation.c | |
| parent | Linux 3.0 (diff) | |
| parent | Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errors (diff) | |
| download | kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.tar.gz kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.tar.xz kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.zip | |
Merge branch 'integration' into for-linus
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 5e0a3dc79a45..59bb1764273d 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2955,7 +2955,8 @@ static int relocate_file_extent_cluster(struct inode *inode, page_cache_sync_readahead(inode->i_mapping, ra, NULL, index, last_index + 1 - index); - page = grab_cache_page(inode->i_mapping, index); + page = find_or_create_page(inode->i_mapping, index, + GFP_NOFS); if (!page) { btrfs_delalloc_release_metadata(inode, PAGE_CACHE_SIZE); |