From: Linus Torvalds <torva...@linux-foundation.org> Date: Fri, 2 Sep 2016 11:09:23 -0700 (PDT)
> > From: Linus Torvalds <torva...@linux-foundation.org> > Date: Thu, 1 Sep 2016 14:56:49 -0700 > Subject: [PATCH 1/2] Revert "af_unix: Fix splice-bind deadlock" > > This reverts commit c845acb324aa85a39650a14e7696982ceea75dc1. > > It turns out that it just replaces one deadlock with another one: we can > still get the wrong lock ordering with the readlock due to overlayfs > calling back into the filesystem layer and still taking the vfs locks > after the readlock. > > The proper solution ends up being to just split the readlock into two > pieces: the bind lock (taken *outside* the vfs locks) and the IO lock > (taken *inside* the filesystem locks). The two locks are independent > anyway. > > Signed-off-by: Linus Torvalds <torva...@linux-foundation.org> Applied.