From e77db04c33e00d37243d60d2e82633e3bb5331ed Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 10 Apr 2006 09:02:40 +0200
Subject: [PATCH] --- yaml --- r: 25599 b: refs/heads/master c:
 9aefe431f5a000884db7ae74ac208de814fe5913 h: refs/heads/master i:   25597:
 cc17ee7d9ba97a6190829baee4d211eb5686cc7c   25595:
 b5549f05b7aaab726f85c70fe8d0cfaf362d9b41   25591:
 7bd4dc0c75a89d0212a6b15528695b7a32923ab7   25583:
 7b24ab3f39ecdf79b689db306b912a6012e153b8   25567:
 a0632587662454cf4461dc80cb2064f595c7e3da   25535:
 44a0e26f6a5022801967ccc3532069e94ebfc99e   25471:
 7f3839ed8b2106ec947426a34adde3f4eddabacd   25343:
 67c423f201ec98ad81746bbb5a475c2b65dea5c3   25087:
 51d08bd9eeae8ea5aa4e70ac0429956f5e7ffdd8   24575:
 9c716ca855cb7c4f56bde62a7b8bf5ba7306ece1 v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36d4d25fd6c2..9cb0dd15e096 100644
--- 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
index b450acdff397..26f5f7ecee5c 100644
--- 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;
 }