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

Commit f7380af0 authored by Al Viro's avatar Al Viro
Browse files

ceph: don't bother with d_rehash() in splice_dentry() 



d_splice_alias() guarantees that it'll be always hashed

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 949a852e

fs/ceph/inode.c

+4 −13
Original line number Diff line number Diff line
@@ -975,13 +975,8 @@ static void update_dentry_lease(struct dentry *dentry, 
/*

 * splice a dentry to an inode.

 * caller must hold directory i_mutex for this to be safe.

 *

 * we will only rehash the resulting dentry if @prehash is

 * true; @prehash will be set to false (for the benefit of

 * the caller) if we fail.

 */

static struct dentry *splice_dentry(struct dentry *dn, struct inode *in,

				    bool *prehash)

static struct dentry *splice_dentry(struct dentry *dn, struct inode *in)

{

	struct dentry *realdn;
@@ -994,8 +989,6 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, 
	if (IS_ERR(realdn)) {

		pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",

		       PTR_ERR(realdn), dn, in, ceph_vinop(in));

		if (prehash)

			*prehash = false; /* don't rehash on error */

		dn = realdn; /* note realdn contains the error */

		goto out;

	} else if (realdn) {
@@ -1011,8 +1004,6 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, 
		dout("dn %p attached to %p ino %llx.%llx\n",

		     dn, d_inode(dn), ceph_vinop(d_inode(dn)));

	}

	if ((!prehash || *prehash) && d_unhashed(dn))

		d_rehash(dn);

out:

	return dn;

}
@@ -1260,7 +1251,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, 
		if (d_really_is_negative(dn)) {

			ceph_dir_clear_ordered(dir);

			ihold(in);

			dn = splice_dentry(dn, in, &have_lease);

			dn = splice_dentry(dn, in);

			if (IS_ERR(dn)) {

				err = PTR_ERR(dn);

				goto done;
@@ -1290,7 +1281,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, 
		dout(" linking snapped dir %p to dn %p\n", in, dn);

		ceph_dir_clear_ordered(dir);

		ihold(in);

		dn = splice_dentry(dn, in, NULL);

		dn = splice_dentry(dn, in);

		if (IS_ERR(dn)) {

			err = PTR_ERR(dn);

			goto done;
@@ -1501,7 +1492,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, 
		}



		if (d_really_is_negative(dn)) {

			struct dentry *realdn = splice_dentry(dn, in, NULL);

			struct dentry *realdn = splice_dentry(dn, in);

			if (IS_ERR(realdn)) {

				err = PTR_ERR(realdn);

				d_drop(dn);