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

Commit e9d4f0b9 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: use d_splice_alias for directories. 



In the Linux dcache a directory only ever has one dentry,
so d_splice_alias() can be used by ll_splice_alias() for directories.
It will find the one dentry whether it is DCACHE_DISCONNECTED or
IS_ROOT() or d_lustre_invalid().
Separating out the directories from non-directories will allow us
to simplify the non-directory code.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a22c3d41

drivers/staging/lustre/lustre/llite/namei.c

+7 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry) 
 */

struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)

{

	if (inode) {

	if (inode && !S_ISDIR(inode->i_mode)) {

		struct dentry *new = ll_find_alias(inode, de);



		if (new) {
@@ -445,8 +445,13 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de) 
			      new, d_inode(new), d_count(new), new->d_flags);

			return new;

		}

	}

		d_add(de, inode);

	} else {

		struct dentry *new = d_splice_alias(inode, de);



		if (new)

			de = new;

	}

	CDEBUG(D_DENTRY, "Add dentry %p inode %p refc %d flags %#x\n",

	       de, d_inode(de), d_count(de), de->d_flags);

	return de;