Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d79b40 authored by Yehuda Sadeh's avatar Yehuda Sadeh Committed by Sage Weil
Browse files

ceph: keep reference to parent inode on ceph_dentry 



When creating a new dentry we now hold a reference to the parent
inode in the ceph_dentry.  This is required due to the new RCU
changes from 949854d0, which set dentry->d_parent to NULL in d_kill before
calling the ->release() callback.  If/when that behavior is changed, we can
revert this hack.

Signed-off-by: default avatarYehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent e8e1ba96

fs/ceph/dir.c

+4 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ int ceph_init_dentry(struct dentry *dentry) 
	}

	di->dentry = dentry;

	di->lease_session = NULL;

	di->parent_inode = igrab(dentry->d_parent->d_inode);

	dentry->d_fsdata = di;

	dentry->d_time = jiffies;

	ceph_dentry_lru_add(dentry);
@@ -1025,7 +1026,7 @@ static void ceph_dentry_release(struct dentry *dentry) 
	u64 snapid = CEPH_NOSNAP;



	if (!IS_ROOT(dentry)) {

		parent_inode = dentry->d_parent->d_inode;

		parent_inode = di->parent_inode;

		if (parent_inode)

			snapid = ceph_snap(parent_inode);

	}
@@ -1050,6 +1051,8 @@ static void ceph_dentry_release(struct dentry *dentry) 
		kmem_cache_free(ceph_dentry_cachep, di);

		dentry->d_fsdata = NULL;

	}

	if (parent_inode)

		iput(parent_inode);

}



static int ceph_snapdir_d_revalidate(struct dentry *dentry,

fs/ceph/super.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ struct ceph_dentry_info { 
	struct dentry *dentry;

	u64 time;

	u64 offset;

	struct inode *parent_inode;

};



struct ceph_inode_xattrs_info {