From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2018 16:53:33 +0000 (-0700)
Subject: Merge branch 'work.rmdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.18-rc1~190
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c50eafc32ddbd166c8a2bbaecd4ad201c452b14;p=users%2Fhch%2Fdma-mapping.git

Merge branch 'work.rmdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull rmdir update from Al Viro:
 "More shrink_dcache_parent()-related stuff - killing the main source of
  potentially contended calls of that on large subtrees"

* 'work.rmdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  rmdir(),rename(): do shrink_dcache_parent() only on success
---

9c50eafc32ddbd166c8a2bbaecd4ad201c452b14