lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: remove page upon writeback completion if lost cache cap

Browse Source 
This page should have been removed earlier when the cache cap was
revoked, but a writeback was in flight, so it was skipped. We truncate
it here just as the writeback finishes, while it's still locked.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Yehuda Sadeh
2010-02-19 00:07:01 +00:00
committed by Sage Weil
parent 5ecad6fd7b
commit e63dc5c780
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ceph/addr.c
View File

@@ -514,6 +514,7 @@ static void writepages_finish(struct ceph_osd_request *req,
u64 bytes = 0; u64 bytes = 0;
struct ceph_client *client = ceph_inode_to_client(inode); struct ceph_client *client = ceph_inode_to_client(inode);
long writeback_stat; long writeback_stat;
unsigned issued = __ceph_caps_issued(ci, NULL);
/* parse reply */ /* parse reply */
replyhead = msg->front.iov_base; replyhead = msg->front.iov_base;
@@ -559,6 +560,16 @@ static void writepages_finish(struct ceph_osd_request *req,
ceph_put_snap_context(snapc); ceph_put_snap_context(snapc);
dout("unlocking %d %p\n", i, page); dout("unlocking %d %p\n", i, page);
end_page_writeback(page); end_page_writeback(page);
/*
* We lost the cache cap, need to truncate the page before
* it is unlocked, otherwise we'd truncate it later in the
* page truncation thread, possibly losing some data that
* raced its way in
*/
if ((issued & CEPH_CAP_FILE_CACHE) == 0)
generic_error_remove_page(inode->i_mapping, page);
unlock_page(page); unlock_page(page);
} }
dout("%p wrote+cleaned %d pages\n", inode, wrote); dout("%p wrote+cleaned %d pages\n", inode, wrote);