ceph: use common helper for aborted dir request invalidation
We invalidate I_COMPLETE and dentry leases in two places: on aborted mds request and on request replay. Use common helper to avoid duplicate code. Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
85792d0dd6
commit
167c9e352d
|
@ -941,21 +941,8 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
|
|||
|
||||
if (!rinfo->head->is_target && !rinfo->head->is_dentry) {
|
||||
dout("fill_trace reply is empty!\n");
|
||||
if (rinfo->head->result == 0 && req->r_locked_dir) {
|
||||
struct ceph_inode_info *ci =
|
||||
ceph_inode(req->r_locked_dir);
|
||||
dout(" clearing %p complete (empty trace)\n",
|
||||
req->r_locked_dir);
|
||||
spin_lock(&req->r_locked_dir->i_lock);
|
||||
ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
|
||||
ci->i_release_count++;
|
||||
spin_unlock(&req->r_locked_dir->i_lock);
|
||||
|
||||
if (req->r_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_dentry);
|
||||
if (req->r_old_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_old_dentry);
|
||||
}
|
||||
if (rinfo->head->result == 0 && req->r_locked_dir)
|
||||
ceph_invalidate_dir_request(req);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1794,22 +1794,8 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
|
|||
mutex_unlock(&req->r_fill_mutex);
|
||||
|
||||
if (req->r_locked_dir &&
|
||||
(req->r_op & CEPH_MDS_OP_WRITE)) {
|
||||
struct ceph_inode_info *ci =
|
||||
ceph_inode(req->r_locked_dir);
|
||||
|
||||
dout("aborted, clearing I_COMPLETE on %p, leases\n",
|
||||
req->r_locked_dir);
|
||||
spin_lock(&req->r_locked_dir->i_lock);
|
||||
ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
|
||||
ci->i_release_count++;
|
||||
spin_unlock(&req->r_locked_dir->i_lock);
|
||||
|
||||
if (req->r_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_dentry);
|
||||
if (req->r_old_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_old_dentry);
|
||||
}
|
||||
(req->r_op & CEPH_MDS_OP_WRITE))
|
||||
ceph_invalidate_dir_request(req);
|
||||
} else {
|
||||
err = req->r_err;
|
||||
}
|
||||
|
@ -1820,6 +1806,27 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
* Invalidate dir I_COMPLETE, 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(&inode->i_lock);
|
||||
ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
|
||||
ci->i_release_count++;
|
||||
spin_unlock(&inode->i_lock);
|
||||
|
||||
if (req->r_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_dentry);
|
||||
if (req->r_old_dentry)
|
||||
ceph_invalidate_dentry_lease(req->r_old_dentry);
|
||||
}
|
||||
|
||||
/*
|
||||
* Handle mds reply.
|
||||
*
|
||||
|
|
|
@ -303,6 +303,8 @@ extern void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc,
|
|||
struct inode *inode,
|
||||
struct dentry *dn, int mask);
|
||||
|
||||
extern void ceph_invalidate_dir_request(struct ceph_mds_request *req);
|
||||
|
||||
extern struct ceph_mds_request *
|
||||
ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode);
|
||||
extern void ceph_mdsc_submit_request(struct ceph_mds_client *mdsc,
|
||||
|
|
Loading…
Reference in a new issue