Commit cd2492b0 authored by Jeff Layton's avatar Jeff Layton Committed by Xponential31
Browse files

ceph: ensure d_name stability in ceph_dentry_hash() 



commit 76a495d666e5043ffc315695f8241f5e94a98849 upstream.

Take the d_lock here to ensure that d_name doesn't change.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 389b1747

fs/ceph/dir.c

+5 −1
Original line number Diff line number Diff line
@@ -1308,6 +1308,7 @@ void ceph_dentry_lru_del(struct dentry *dn) 
unsigned ceph_dentry_hash(struct inode *dir, struct dentry *dn)

{

	struct ceph_inode_info *dci = ceph_inode(dir);

	unsigned hash;



	switch (dci->i_dir_layout.dl_dir_hash) {

	case 0:	/* for backward compat */
@@ -1315,8 +1316,11 @@ unsigned ceph_dentry_hash(struct inode *dir, struct dentry *dn) 
		return dn->d_name.hash;



	default:

		return ceph_str_hash(dci->i_dir_layout.dl_dir_hash,

		spin_lock(&dn->d_lock);

		hash = ceph_str_hash(dci->i_dir_layout.dl_dir_hash,

				     dn->d_name.name, dn->d_name.len);

		spin_unlock(&dn->d_lock);

		return hash;

	}

}