---

yaml --- r: 39491 b: refs/heads/master c: e6e80f2 h: refs/heads/master i: 39489: c4fb99f 39487: 590c67f v: v3
git-mirror · Oct 12, 2006 · 8389f89 · 8389f89
1 parent 44cf37e
commit 8389f89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a22b169df1b9f259391cf3b8ad8bfeea3d7be3f1
+refs/heads/master: e6e80f294c2688302f41959c57acfee7e131e489
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -607,7 +607,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
 			ret = -ENOMEM;
 			page = page_cache_alloc_cold(mapping);
 			if (unlikely(!page))
-				goto out_nomem;
+				goto out_ret;
 
 			/*
 			 * This will also lock the page
@@ -666,7 +666,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
 		if (sd->pos + this_len > isize)
 			vmtruncate(mapping->host, isize);
 
-		goto out;
+		goto out_ret;
 	}
 
 	if (buf->page != page) {
@@ -698,7 +698,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
 out:
 	page_cache_release(page);
 	unlock_page(page);
-out_nomem:
+out_ret:
 	return ret;
 }