• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 758f8758
    Linus Torvalds authored
    Pull user namespace update from Eric Biederman:
     "The only change that is production ready this round is the work to
      increase the number of uid and gid mappings a user namespace can
      support from 5 to 340.
      This code was carefully benchmarked and it was confirmed that in the
      existing cases the performance remains the same. In the worst case
      with 340 mappings an cache cold stat times go from 158ns to 248ns.
      That is noticable but still quite small, and only the people who are
      doing crazy things pay the cost.
      This work uncovered some documentation and cleanup opportunities in
      the mapping code, and patches to make those cleanups and improve the
      documentation will be coming in the next merge window"
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
      userns: Simplify insert_extent
      userns: Make map_id_down a wrapper for map_id_range_down
      userns: Don't read extents twice in m_start
      userns: Simplify the user and group mapping functions
      userns: Don't special case a count of 0
      userns: bump idmap limits to 340
      userns: use union in {g,u}idmap struct
user_namespace.c 33.3 KB