iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

userns: Don't special case a count of 0

Browse Source 
We can always use a count of 1 so there is no reason to have
a special case of a count of 0.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2017-10-31 15:54:32 -05:00
parent 6397fac491
commit 11a8b9270e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/user_namespace.c
View File

@ -232,11 +232,7 @@ static int cmp_map_id(const void *k, const void *e)
const struct idmap_key *key = k;
const struct uid_gid_extent *el = e;
/* handle map_id_range_down() */
if (key->count)
id2 = key->id + key->count - 1;
else
id2 = key->id;
id2 = key->id + key->count - 1;
/* handle map_id_{down,up}() */
if (key->map_up)
@ -362,7 +358,7 @@ static u32 map_id_down(struct uid_gid_map *map, u32 id)
if (extents <= UID_GID_MAP_MAX_BASE_EXTENTS)
return map_id_down_base(map, id);
return map_id_range_down_max(map, id, 0);
return map_id_range_down_max(map, id, 1);
}
/**
@ -404,7 +400,7 @@ static u32 map_id_up_max(struct uid_gid_map *map, u32 id)
struct idmap_key key;
key.map_up = true;
key.count = 0;
key.count = 1;
key.id = id;
extents = map->nr_extents;