]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 01:13:34 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 01:13:34 +0000 (18:13 -0700)
commit5a3e6d8823085d5fb1b26cc02e26136d2bb1aad6
tree0787800f490f98ffd41b958e52ab15732335744e
parent227b5623365884d6675c56b7a749431c1c22174b
parent823f3d8f2d0690455421d48d6067e941989fa7a8
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  locks: turn lock_flocks into a spinlock
  fasync: re-organize fasync entry insertion to allow it under a spinlock
  locks/nfsd: allocate file lock outside of spinlock
  lockd: fix nlmsvc_notify_blocked locking
  lockd: push lock_flocks down
fs/Kconfig
fs/locks.c
include/linux/fs.h