aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-10-11 04:03:09 -0400
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-10-12 09:08:51 -0400
commite6e80f294c2688302f41959c57acfee7e131e489 (patch)
treee09562611ebd0060c7876093b6b2ce1296e6793f
parenta22b169df1b9f259391cf3b8ad8bfeea3d7be3f1 (diff)
[PATCH] splice: fix pipe_to_file() ->prepare_write() error path
Don't jump to the unlock+release path, we already did that. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--fs/splice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 13e92dd19fbb..a567010b62ac 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -607,7 +607,7 @@ find_page:
607 ret = -ENOMEM; 607 ret = -ENOMEM;
608 page = page_cache_alloc_cold(mapping); 608 page = page_cache_alloc_cold(mapping);
609 if (unlikely(!page)) 609 if (unlikely(!page))
610 goto out_nomem; 610 goto out_ret;
611 611
612 /* 612 /*
613 * This will also lock the page 613 * This will also lock the page
@@ -666,7 +666,7 @@ find_page:
666 if (sd->pos + this_len > isize) 666 if (sd->pos + this_len > isize)
667 vmtruncate(mapping->host, isize); 667 vmtruncate(mapping->host, isize);
668 668
669 goto out; 669 goto out_ret;
670 } 670 }
671 671
672 if (buf->page != page) { 672 if (buf->page != page) {
@@ -698,7 +698,7 @@ find_page:
698out: 698out:
699 page_cache_release(page); 699 page_cache_release(page);
700 unlock_page(page); 700 unlock_page(page);
701out_nomem: 701out_ret:
702 return ret; 702 return ret;
703} 703}
704 704