Commit ca6c8ae0 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov

ceph: pass parent inode info to ceph_encode_dentry_release if we have it

If we have a parent inode reference already, then we don't need to
go back up the directory tree to find one.

Link: default avatarJeff Layton <>
Reviewed-by: default avatarYan, Zheng <>
Signed-off-by: default avatarIlya Dryomov <>
parent adf0d687
......@@ -3924,9 +3924,10 @@ int ceph_encode_inode_release(void **p, struct inode *inode,
int ceph_encode_dentry_release(void **p, struct dentry *dentry,
struct inode *dir,
int mds, int drop, int unless)
struct dentry *parent;
struct dentry *parent = NULL;
struct ceph_mds_request_release *rel = *p;
struct ceph_dentry_info *di = ceph_dentry(dentry);
int force = 0;
......@@ -3941,11 +3942,13 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry,
if (di->lease_session && di->lease_session->s_mds == mds)
force = 1;
parent = dget(dentry->d_parent);
if (!dir) {
parent = dget(dentry->d_parent);
dir = d_inode(parent);
ret = ceph_encode_inode_release(p, d_inode(parent), mds, drop,
unless, force);
ret = ceph_encode_inode_release(p, dir, mds, drop, unless, force);
......@@ -1954,10 +1954,13 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
mds, req->r_inode_drop, req->r_inode_unless, 0);
if (req->r_dentry_drop)
releases += ceph_encode_dentry_release(&p, req->r_dentry,
mds, req->r_dentry_drop, req->r_dentry_unless);
req->r_locked_dir, mds, req->r_dentry_drop,
if (req->r_old_dentry_drop)
releases += ceph_encode_dentry_release(&p, req->r_old_dentry,
mds, req->r_old_dentry_drop, req->r_old_dentry_unless);
req->r_old_dentry_dir, mds,
if (req->r_old_inode_drop)
releases += ceph_encode_inode_release(&p,
......@@ -904,6 +904,7 @@ extern void ceph_flush_dirty_caps(struct ceph_mds_client *mdsc);
extern int ceph_encode_inode_release(void **p, struct inode *inode,
int mds, int drop, int unless, int force);
extern int ceph_encode_dentry_release(void **p, struct dentry *dn,
struct inode *dir,
int mds, int drop, int unless);
extern int ceph_get_caps(struct ceph_inode_info *ci, int need, int want,
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment