diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2006-10-11 10:03:09 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-10-12 15:08:51 +0200 |
| commit | e6e80f294c2688302f41959c57acfee7e131e489 (patch) | |
| tree | e09562611ebd0060c7876093b6b2ce1296e6793f | |
| parent | a22b169df1b9f259391cf3b8ad8bfeea3d7be3f1 (diff) | |
| download | op-kernel-dev-e6e80f294c2688302f41959c57acfee7e131e489.zip op-kernel-dev-e6e80f294c2688302f41959c57acfee7e131e489.tar.gz | |
[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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/splice.c b/fs/splice.c index 13e92dd..a567010 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -607,7 +607,7 @@ find_page: 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 @@ find_page: if (sd->pos + this_len > isize) vmtruncate(mapping->host, isize); - goto out; + goto out_ret; } if (buf->page != page) { @@ -698,7 +698,7 @@ find_page: out: page_cache_release(page); unlock_page(page); -out_nomem: +out_ret: return ret; } |
