Merge tag 'driver-core-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH: "Here is one kernfs fix for a reported issue for 3.19-rc5. It has been in linux-next for a while" * tag 'driver-core-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: kernfs: Fix kernfs_name_compare
This commit is contained in:
@@ -201,10 +201,14 @@ static unsigned int kernfs_name_hash(const char *name, const void *ns)
|
||||
static int kernfs_name_compare(unsigned int hash, const char *name,
|
||||
const void *ns, const struct kernfs_node *kn)
|
||||
{
|
||||
if (hash != kn->hash)
|
||||
return hash - kn->hash;
|
||||
if (ns != kn->ns)
|
||||
return ns - kn->ns;
|
||||
if (hash < kn->hash)
|
||||
return -1;
|
||||
if (hash > kn->hash)
|
||||
return 1;
|
||||
if (ns < kn->ns)
|
||||
return -1;
|
||||
if (ns > kn->ns)
|
||||
return 1;
|
||||
return strcmp(name, kn->name);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user