Skip to content

Commit

Permalink
ceph: Fix __ceph_do_pending_vmtruncate
Browse files Browse the repository at this point in the history
we should set i_truncate_pending to 0 after page cache is truncated
to i_truncate_size

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Yan, Zheng authored and Alex Elder committed Dec 13, 2012
1 parent 0685235 commit a85f50b
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions fs/ceph/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)
{
struct ceph_inode_info *ci = ceph_inode(inode);
u64 to;
int wrbuffer_refs, wake = 0;
int wrbuffer_refs, finish = 0;

retry:
spin_lock(&ci->i_ceph_lock);
Expand Down Expand Up @@ -1498,15 +1498,18 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)
truncate_inode_pages(inode->i_mapping, to);

spin_lock(&ci->i_ceph_lock);
ci->i_truncate_pending--;
if (ci->i_truncate_pending == 0)
wake = 1;
if (to == ci->i_truncate_size) {
ci->i_truncate_pending = 0;
finish = 1;
}
spin_unlock(&ci->i_ceph_lock);
if (!finish)
goto retry;

if (wrbuffer_refs == 0)
ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL);
if (wake)
wake_up_all(&ci->i_cap_wq);

wake_up_all(&ci->i_cap_wq);
}


Expand Down

0 comments on commit a85f50b

Please sign in to comment.