Commit f36132a7 authored by Li Wang's avatar Li Wang Committed by Sage Weil
Browse files

ceph: Clean up if error occurred in finish_read() 



Clean up if error occurred rather than going through normal process

Signed-off-by: default avatarLi Wang <liwang@ubuntukylin.com>
Signed-off-by: default avatarYunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 8eb4efb0

fs/ceph/addr.c

+3 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg) 
	for (i = 0; i < num_pages; i++) {

		struct page *page = osd_data->pages[i];



		if (rc < 0)

			goto unlock;

		if (bytes < (int)PAGE_CACHE_SIZE) {

			/* zero (remainder of) page */

			int s = bytes < 0 ? 0 : bytes;
@@ -266,6 +268,7 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg) 
		flush_dcache_page(page);

		SetPageUptodate(page);

		ceph_readpage_to_fscache(inode, page);

unlock:

		unlock_page(page);

		page_cache_release(page);

		bytes -= PAGE_CACHE_SIZE;