---

yaml --- r: 97413 b: refs/heads/master c: ca39d65 h: refs/heads/master i: 97411: 26eeffd v: v3
git-mirror · May 28, 2008 · bedd0c4 · bedd0c4
1 parent 824b2f0
commit bedd0c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a82c53a0e3f57f02782330372b7adad67b417645
+refs/heads/master: ca39d651d17df49b6d11f851d56c0ce0ce01ea1a
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -58,8 +58,8 @@ static int page_cache_pipe_buf_steal(struct pipe_inode_info *pipe,
 		 */
 		wait_on_page_writeback(page);
 
-		if (PagePrivate(page))
-			try_to_release_page(page, GFP_KERNEL);
+		if (PagePrivate(page) && !try_to_release_page(page, GFP_KERNEL))
+			goto out_unlock;
 
 		/*
 		 * If we succeeded in removing the mapping, set LRU flag
@@ -75,6 +75,7 @@ static int page_cache_pipe_buf_steal(struct pipe_inode_info *pipe,
 	 * Raced with truncate or failed to remove page from current
 	 * address space, unlock and return failure.
 	 */
+out_unlock:
 	unlock_page(page);
 	return 1;
 }