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

Commit 81fca444 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: move permission check back into __lookup_hash 



The caller that didn't need it is gone.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 72e58063

fs/namei.c

+4 −10
Original line number Diff line number Diff line
@@ -1121,11 +1121,13 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, 
static struct dentry *__lookup_hash(struct qstr *name,

		struct dentry *base, struct nameidata *nd)

{

	struct inode *inode = base->d_inode;

	struct dentry *dentry;

	struct inode *inode;

	int err;



	inode = base->d_inode;

	err = exec_permission(inode);

	if (err)

		return ERR_PTR(err);



	/*

	 * See if the low-level filesystem might want
@@ -1161,11 +1163,6 @@ static struct dentry *__lookup_hash(struct qstr *name, 
 */

static struct dentry *lookup_hash(struct nameidata *nd)

{

	int err;



	err = exec_permission(nd->path.dentry->d_inode);

	if (err)

		return ERR_PTR(err);

	return __lookup_hash(&nd->last, nd->path.dentry, nd);

}
@@ -1213,9 +1210,6 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) 
	if (err)

		return ERR_PTR(err);



	err = exec_permission(base->d_inode);

	if (err)

		return ERR_PTR(err);

	return __lookup_hash(&this, base, NULL);

}