[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>
This commit is contained in:
parent
a22b169df1
commit
e6e80f294c
|
@ -607,7 +607,7 @@ find_page:
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
page = page_cache_alloc_cold(mapping);
|
page = page_cache_alloc_cold(mapping);
|
||||||
if (unlikely(!page))
|
if (unlikely(!page))
|
||||||
goto out_nomem;
|
goto out_ret;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This will also lock the page
|
* This will also lock the page
|
||||||
|
@ -666,7 +666,7 @@ find_page:
|
||||||
if (sd->pos + this_len > isize)
|
if (sd->pos + this_len > isize)
|
||||||
vmtruncate(mapping->host, isize);
|
vmtruncate(mapping->host, isize);
|
||||||
|
|
||||||
goto out;
|
goto out_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buf->page != page) {
|
if (buf->page != page) {
|
||||||
|
@ -698,7 +698,7 @@ find_page:
|
||||||
out:
|
out:
|
||||||
page_cache_release(page);
|
page_cache_release(page);
|
||||||
unlock_page(page);
|
unlock_page(page);
|
||||||
out_nomem:
|
out_ret:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue