---

yaml --- r: 25599 b: refs/heads/master c: 9aefe43 h: refs/heads/master i: 25597: cc17ee7 25595: b5549f0 25591: 7bd4dc0 25583: 7b24ab3 25567: a063258 25535: 44a0e26 25471: 7f3839e 25343: 67c423f 25087: 51d08bd 24575: 9c716ca v: v3
git-mirror · Apr 10, 2006 · e77db04 · e77db04
1 parent 1b6658e
commit e77db04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7f21e4f5a3d4e378e4d453b2be209dcfd1bb964
+refs/heads/master: 9aefe431f5a000884db7ae74ac208de814fe5913
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -445,7 +445,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
 		ret = -ENOMEM;
 		page = find_or_create_page(mapping, index, gfp_mask);
 		if (!page)
-			goto out;
+			goto out_nomem;
 
 		/*
 		 * If the page is uptodate, it is also locked. If it isn't
@@ -508,6 +508,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
 		page_cache_release(page);
 		unlock_page(page);
 	}
+out_nomem:
 	buf->ops->unmap(info, buf);
 	return ret;
 }