tree a66df501738e7f5bb06dfd7e0b2a564fd2c40361
parent 81368f8bb8dd008f15d0300b89cbe1ffa7e675aa
parent 9ef7db7f38d0472dd9c444e42d5c5175ccbe5451
author Linus Torvalds <torvalds@linux-foundation.org> 1410112798 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1410112798 -0700

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

Pull filesystem fixes from Al Viro:
 "Several bugfixes (all of them -stable fodder).

  Alexey's one deals with double mutex_lock() in UFS (apparently, nobody
  has tried to test "ufs: sb mutex merge + mutex_destroy" on something
  like file creation/removal on ufs).  Mine deal with two kinds of
  umount bugs, in umount propagation and in handling of automounted
  submounts, both resulting in bogus transient EBUSY from umount"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ufs: fix deadlocks introduced by sb mutex merge
  fix EBUSY on umount() from MNT_SHRINKABLE
  get rid of propagate_umount() mistakenly treating slaves as busy.