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

Commit 855371bd authored by Al Viro's avatar Al Viro
Browse files

afs: switch dynroot lookups to d_splice_alias() 



->lookup() methods can (and should) use d_splice_alias() instead of
d_add().  Even if they are not going to be hit by open_by_handle(),
code does get copied around...

Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 50f30740

fs/afs/dynroot.c

+3 −15
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr 
{

	struct afs_vnode *vnode;

	struct inode *inode;

	int ret;



	vnode = AFS_FS_I(dir);
@@ -161,21 +160,10 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr 
		return afs_lookup_atcell(dentry);



	inode = afs_try_auto_mntpt(dentry, dir);

	if (IS_ERR(inode)) {

		ret = PTR_ERR(inode);

		if (ret == -ENOENT) {

			d_add(dentry, NULL);

			_leave(" = NULL [negative]");

			return NULL;

		}

		_leave(" = %d [do]", ret);

		return ERR_PTR(ret);

	}

	if (inode == ERR_PTR(-ENOENT))

		inode = NULL;



	d_add(dentry, inode);

	_leave(" = 0 { ino=%lu v=%u }",

	       d_inode(dentry)->i_ino, d_inode(dentry)->i_generation);

	return NULL;

	return d_splice_alias(inode, dentry);

}



const struct inode_operations afs_dynroot_inode_operations = {