diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-07-20 15:21:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-08-09 14:27:32 -0700 |
| commit | 36e1ed699210fd0173dfe0a8b2cde8a6b648ba3f (patch) | |
| tree | 367f6ec90883e7289e5d9f17f6ebae0acff4de76 | |
| parent | 6b6c21263e3fe3f036c1bb04a65d032394167e64 (diff) | |
splice: fix double page unlock
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: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/splice.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index e7d7080de2f9..d3c6668bdbdd 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -601,7 +601,7 @@ find_page: ret = add_to_page_cache_lru(page, mapping, index, GFP_KERNEL); if (unlikely(ret)) - goto out; + goto out_release; } ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len); @@ -657,8 +657,9 @@ find_page: */ mark_page_accessed(page); out: - page_cache_release(page); unlock_page(page); +out_release: + page_cache_release(page); out_ret: return ret; } |