tree 4a906422538887be858b9cbdf848d68f8db6c116
parent 97956605d8f2a0d17706cbd338a6cfe8de1920e9
parent c5aa1e554a20fb3542c62688ae46049c9225a965
author Linus Torvalds <torvalds@linux-foundation.org> 1348851773 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1348851773 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A couple of fixes; one for automount/lazy umount race, another a
  classic "we don't protect the refcount transition to zero with the
  lock that protects looking for object in hash" kind of crap in lockd."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  close the race in nlmsvc_free_block()
  do_add_mount()/umount -l races