Don't pass inode to ->d_hash() and ->d_compare()
Instances either don't look at it at all (the majority of cases) or only want it to find the superblock (which can be had as dentry->d_sb). A few cases that want more are actually safe with dentry->d_inode - the only precaution needed is the check that it hadn't been replaced with NULL by rmdir() or by overwriting rename(), which case should be simply treated as cache miss. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:

zatwierdzone przez
Al Viro

rodzic
642b704cd7
commit
da53be12bb
@@ -45,8 +45,8 @@ static struct super_block *efivarfs_sb;
|
||||
* So we need to perform a case-sensitive match on part 1 and a
|
||||
* case-insensitive match on part 2.
|
||||
*/
|
||||
static int efivarfs_d_compare(const struct dentry *parent, const struct inode *pinode,
|
||||
const struct dentry *dentry, const struct inode *inode,
|
||||
static int efivarfs_d_compare(const struct dentry *parent,
|
||||
const struct dentry *dentry,
|
||||
unsigned int len, const char *str,
|
||||
const struct qstr *name)
|
||||
{
|
||||
@@ -63,8 +63,7 @@ static int efivarfs_d_compare(const struct dentry *parent, const struct inode *p
|
||||
return strncasecmp(name->name + guid, str + guid, EFI_VARIABLE_GUID_LEN);
|
||||
}
|
||||
|
||||
static int efivarfs_d_hash(const struct dentry *dentry,
|
||||
const struct inode *inode, struct qstr *qstr)
|
||||
static int efivarfs_d_hash(const struct dentry *dentry, struct qstr *qstr)
|
||||
{
|
||||
unsigned long hash = init_name_hash();
|
||||
const unsigned char *s = qstr->name;
|
||||
@@ -108,7 +107,7 @@ static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name)
|
||||
q.name = name;
|
||||
q.len = strlen(name);
|
||||
|
||||
err = efivarfs_d_hash(NULL, NULL, &q);
|
||||
err = efivarfs_d_hash(NULL, &q);
|
||||
if (err)
|
||||
return ERR_PTR(err);
|
||||
|
||||
|
Reference in New Issue
Block a user