diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-03-13 12:44:32 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-02 06:17:07 +0200 |
| commit | 2f276c511137d97e56b19e29865e1e6569315ccb (patch) | |
| tree | f29a8088a6f312ec40f03b96d96b34e69154627a /fs/ceph/mds_client.c | |
| parent | libceph: more cleanup of write_partial_msg_pages() (diff) | |
| download | linux-2f276c511137d97e56b19e29865e1e6569315ccb.tar.xz linux-2f276c511137d97e56b19e29865e1e6569315ccb.zip | |
ceph: use i_release_count to indicate dir's completeness
Current ceph code tracks directory's completeness in two places.
ceph_readdir() checks i_release_count to decide if it can set the
I_COMPLETE flag in i_ceph_flags. All other places check the I_COMPLETE
flag. This indirection introduces locking complexity.
This patch adds a new variable i_complete_count to ceph_inode_info.
Set i_release_count's value to it when marking a directory complete.
By comparing the two variables, we know if a directory is complete
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Diffstat (limited to 'fs/ceph/mds_client.c')
| -rw-r--r-- | fs/ceph/mds_client.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 600d770d70f7..0db6f5206d11 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2034,20 +2034,16 @@ out: } /* - * Invalidate dir I_COMPLETE, dentry lease state on an aborted MDS + * Invalidate dir's completeness, dentry lease state on an aborted MDS * namespace request. */ void ceph_invalidate_dir_request(struct ceph_mds_request *req) { struct inode *inode = req->r_locked_dir; - struct ceph_inode_info *ci = ceph_inode(inode); - dout("invalidate_dir_request %p (I_COMPLETE, lease(s))\n", inode); - spin_lock(&ci->i_ceph_lock); - ci->i_ceph_flags &= ~CEPH_I_COMPLETE; - ci->i_release_count++; - spin_unlock(&ci->i_ceph_lock); + dout("invalidate_dir_request %p (complete, lease(s))\n", inode); + ceph_dir_clear_complete(inode); if (req->r_dentry) ceph_invalidate_dentry_lease(req->r_dentry); if (req->r_old_dentry) |