---

yaml --- r: 128631 b: refs/heads/master c: 70dec80 h: refs/heads/master i: 128629: edaf837 128627: 5790234 128623: 2e3f6f2 v: v3
git-mirror · Sep 25, 2008 · 7f6db9f · 7f6db9f
1 parent 907e1a1
commit 7f6db9f
Show file tree

Hide file tree

Showing 5 changed files with 299 additions and 115 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aadfeb6e39ad6bde080cb3ab23f4da57ccb25f4a
+refs/heads/master: 70dec8079d78691e476cc6c7cede40656078ad30
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
@@ -274,15 +274,15 @@ int btree_readpage(struct file *file, struct page *page)
 	return extent_read_full_page(tree, page, btree_get_extent);
 }
 
-static int btree_releasepage(struct page *page, gfp_t unused_gfp_flags)
+static int btree_releasepage(struct page *page, gfp_t gfp_flags)
 {
 	struct extent_io_tree *tree;
 	struct extent_map_tree *map;
 	int ret;
 
 	tree = &BTRFS_I(page->mapping->host)->io_tree;
 	map = &BTRFS_I(page->mapping->host)->extent_tree;
-	ret = try_release_extent_mapping(map, tree, page);
+	ret = try_release_extent_mapping(map, tree, page, gfp_flags);
 	if (ret == 1) {
 		ClearPagePrivate(page);
 		set_page_private(page, 0);