splice: fix bad unlock_page() in error case
If add_to_page_cache_lru() fails, the page will not be locked. But splice jumps to an error path that does a page release and unlock, causing a BUG() in unlock_page(). Fix this by adding one more label that just releases the page. This bug was actually triggered on EL5 by gurudas pai <gurudas.pai@oracle.com> using fio. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9d1ca6f13c
commit
6a860c979b
|
@ -594,7 +594,7 @@ find_page:
|
||||||
ret = add_to_page_cache_lru(page, mapping, index,
|
ret = add_to_page_cache_lru(page, mapping, index,
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
goto out;
|
goto out_release;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);
|
ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);
|
||||||
|
@ -650,8 +650,9 @@ find_page:
|
||||||
*/
|
*/
|
||||||
mark_page_accessed(page);
|
mark_page_accessed(page);
|
||||||
out:
|
out:
|
||||||
page_cache_release(page);
|
|
||||||
unlock_page(page);
|
unlock_page(page);
|
||||||
|
out_release:
|
||||||
|
page_cache_release(page);
|
||||||
out_ret:
|
out_ret:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue