iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Link: http://tracker.ceph.com/issues/18148
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Jeff Layton 2016-12-15 08:37:59 -05:00 committed by Ilya Dryomov
parent adf0d68701
commit ca6c8ae0f7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ceph/caps.c
View File

@ -3924,9 +3924,10 @@ int ceph_encode_inode_release(void **p, struct inode *inode,
} }
int ceph_encode_dentry_release(void **p, struct dentry *dentry, int ceph_encode_dentry_release(void **p, struct dentry *dentry,
struct inode *dir,
int mds, int drop, int unless) int mds, int drop, int unless)
{ {
struct dentry *parent; struct dentry *parent = NULL;
struct ceph_mds_request_release *rel = *p; struct ceph_mds_request_release *rel = *p;
struct ceph_dentry_info *di = ceph_dentry(dentry); struct ceph_dentry_info *di = ceph_dentry(dentry);
int force = 0; int force = 0;
@ -3941,11 +3942,13 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry,
spin_lock(&dentry->d_lock); spin_lock(&dentry->d_lock);
if (di->lease_session && di->lease_session->s_mds == mds) if (di->lease_session && di->lease_session->s_mds == mds)
force = 1; force = 1;
parent = dget(dentry->d_parent); if (!dir) {
parent = dget(dentry->d_parent);
dir = d_inode(parent);
}
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
ret = ceph_encode_inode_release(p, d_inode(parent), mds, drop, ret = ceph_encode_inode_release(p, dir, mds, drop, unless, force);
unless, force);
dput(parent); dput(parent);
spin_lock(&dentry->d_lock); spin_lock(&dentry->d_lock);

7
fs/ceph/mds_client.c
View File

@ -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); mds, req->r_inode_drop, req->r_inode_unless, 0);
if (req->r_dentry_drop) if (req->r_dentry_drop)
releases += ceph_encode_dentry_release(&p, req->r_dentry, 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,
req->r_dentry_unless);
if (req->r_old_dentry_drop) if (req->r_old_dentry_drop)
releases += ceph_encode_dentry_release(&p, req->r_old_dentry, 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,
req->r_old_dentry_drop,
req->r_old_dentry_unless);
if (req->r_old_inode_drop) if (req->r_old_inode_drop)
releases += ceph_encode_inode_release(&p, releases += ceph_encode_inode_release(&p,
d_inode(req->r_old_dentry), d_inode(req->r_old_dentry),

1
fs/ceph/super.h
View File

@ -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, extern int ceph_encode_inode_release(void **p, struct inode *inode,
int mds, int drop, int unless, int force); int mds, int drop, int unless, int force);
extern int ceph_encode_dentry_release(void **p, struct dentry *dn, extern int ceph_encode_dentry_release(void **p, struct dentry *dn,
struct inode *dir,
int mds, int drop, int unless); int mds, int drop, int unless);
extern int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, extern int ceph_get_caps(struct ceph_inode_info *ci, int need, int want,