From 8389f89037f24a9abaf9d8ac84e4016a775ac96c Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 11 Oct 2006 10:03:09 +0200 Subject: [PATCH] --- yaml --- r: 39491 b: refs/heads/master c: e6e80f294c2688302f41959c57acfee7e131e489 h: refs/heads/master i: 39489: c4fb99f42af474dc36ccda9c448df460ff0f37c1 39487: 590c67ff3213cd87ae801cf26c160a1de8104970 v: v3 --- [refs] | 2 +- trunk/fs/splice.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e7faa1c92dc6..d29f679733e8 100644 --- 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 index 13e92dd19fbb..a567010b62ac 100644 --- 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; }