mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-25 08:02:56 +00:00
libceph: Unlock unprocessed pages in start_read() error path
Function start_read() can get an error before processing all pages. It must not only release the remaining pages, but unlock them too. This fixes http://tracker.newdream.net/issues/3370 Signed-off-by: David Zafman <david.zafman@inktank.com> Reviewed-by: Alex Elder <elder@inktank.com>
This commit is contained in:
parent
0e5e1774a9
commit
8884d53dd6
1 changed files with 9 additions and 0 deletions
|
@ -267,6 +267,14 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)
|
||||||
kfree(req->r_pages);
|
kfree(req->r_pages);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ceph_unlock_page_vector(struct page **pages, int num_pages)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < num_pages; i++)
|
||||||
|
unlock_page(pages[i]);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* start an async read(ahead) operation. return nr_pages we submitted
|
* start an async read(ahead) operation. return nr_pages we submitted
|
||||||
* a read for on success, or negative error code.
|
* a read for on success, or negative error code.
|
||||||
|
@ -347,6 +355,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
|
||||||
return nr_pages;
|
return nr_pages;
|
||||||
|
|
||||||
out_pages:
|
out_pages:
|
||||||
|
ceph_unlock_page_vector(pages, nr_pages);
|
||||||
ceph_release_page_vector(pages, nr_pages);
|
ceph_release_page_vector(pages, nr_pages);
|
||||||
out:
|
out:
|
||||||
ceph_osdc_put_request(req);
|
ceph_osdc_put_request(req);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue