diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-24 12:21:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-24 12:21:51 -0800 |
| commit | 19ca2c8fecb1592d623fe5e82d6796f8d446268d (patch) | |
| tree | 0756e115d125846f46b302085307768f069434a1 /net/batman-adv/distributed-arp-table.h | |
| parent | a4685d2f58e2230d4e27fb2ee581d7ea35e5d046 (diff) | |
| parent | 880a38547ff08715ce4f1daf9a4bb30c87676e68 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fix from Eric Biederman:
"This has a single brown bag fix.
The possible deadlock with dec_pid_namespaces that I had thought was
fixed earlier turned out only to have been moved. So instead of being
cleaver this change takes ucounts_lock with irqs disabled. So
dec_ucount can be used from any context without fear of deadlock.
The items accounted for dec_ucount and inc_ucount are all
comparatively heavy weight objects so I don't exepct this will have
any measurable performance impact"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
userns: Make ucounts lock irq-safe
Diffstat (limited to 'net/batman-adv/distributed-arp-table.h')