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

Pull vfs stable fodder fixes from Al Viro:

 - acct_on() fix for deadlock caught by overlayfs folks

 - autofs RCU use-after-free SNAFU (->d_manage() can be called
   locklessly, so we need to RCU-delay freeing the objects it looks at)

 - (hopefully) the end of "do we need freeing this dentry RCU-delayed"
   whack-a-mole.

* 'stable-fodder' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  autofs: fix use-after-free in lockless ->d_manage()
  dcache: sort the freeing-without-RCU-delay mess for good.
  acct_on(): don't mess with freeze protection

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index addf7732fb56..81f9831a7859 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -227,7 +227,7 @@ static int acct_on(struct filename *pathname)
                 filp_close(file, NULL);
                 return PTR_ERR(internal);
         }
-        err = mnt_want_write(internal);
+        err = __mnt_want_write(internal);
         if (err) {
                 mntput(internal);
                 kfree(acct);
@@ -252,7 +252,7 @@ static int acct_on(struct filename *pathname)
         old = xchg(&ns->bacct, &acct->pin);
         mutex_unlock(&acct->lock);
         pin_kill(old);
-        mnt_drop_write(mnt);
+        __mnt_drop_write(mnt);
         mntput(mnt);
         return 0;
 }