|
@@ -419,6 +419,11 @@ struct unix_gid {
|
|
|
struct group_info *gi;
|
|
|
};
|
|
|
|
|
|
+static int unix_gid_hash(kuid_t uid)
|
|
|
+{
|
|
|
+ return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
|
|
|
+}
|
|
|
+
|
|
|
static void unix_gid_put(struct kref *kref)
|
|
|
{
|
|
|
struct cache_head *item = container_of(kref, struct cache_head, ref);
|
|
@@ -530,7 +535,7 @@ static int unix_gid_parse(struct cache_detail *cd,
|
|
|
ug.h.expiry_time = expiry;
|
|
|
ch = sunrpc_cache_update(cd,
|
|
|
&ug.h, &ugp->h,
|
|
|
- hash_long(uid, GID_HASHBITS));
|
|
|
+ unix_gid_hash(uid));
|
|
|
if (!ch)
|
|
|
err = -ENOMEM;
|
|
|
else {
|
|
@@ -621,7 +626,7 @@ static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid)
|
|
|
struct cache_head *ch;
|
|
|
|
|
|
ug.uid = uid;
|
|
|
- ch = sunrpc_cache_lookup(cd, &ug.h, hash_long(uid, GID_HASHBITS));
|
|
|
+ ch = sunrpc_cache_lookup(cd, &ug.h, unix_gid_hash(uid));
|
|
|
if (ch)
|
|
|
return container_of(ch, struct unix_gid, h);
|
|
|
else
|