tree 3bce1df52836b63e3b0b53d31f1207e9fd9f51f3
parent 227701e0e7078065f24f5a6ca220218fd80023a5
parent 040d786032bf59002d374b86d75b04d97624005c
author Linus Torvalds <torvalds@linux-foundation.org> 1513370907 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1513370907 -0800
mergetag object 040d786032bf59002d374b86d75b04d97624005c
 type commit
 tag ceph-for-4.15-rc4
 tagger Ilya Dryomov <idryomov@gmail.com> 1513354724 +0100
 
 CephFS inode trimming fix from Zheng, marked for stable.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJaM/Y/AAoJEEp/3jgCEfOLSu0H/iFhQS+7rnyPcb3P8/YR785H
 IMPNWv8hg4UU6MDWC3lIliAPypAkaMLuEKOZvBRsLCW5esbOTlCP7w4bmO/YCI66
 DF0JfA4AV5yXIVMAtjP2EK3sFz0eCrK6S3XP3cT+x3K5qI6zwNN3Yvj78NFcvCOz
 IBgxrlhpu7/DfBsorhKEAEHXaYE+NKJNlcGBIisvM0BNC9dcm7ufTkP7pP6mRJC0
 GjjYqh8HMe45AvvIaE7o976M1GKexEDNsncHM8VlxuwkC5hz0SNAg73J7iwcDfUe
 hqfLeHcvTOrPQ0oB4Xz0Nh6cJ7tIv3gYZ941awhmH6XZCWgZhrBaLyipIenXEHM=
 =xpe2
 -----END PGP SIGNATURE-----

Merge tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "CephFS inode trimming fix from Zheng, marked for stable"

* tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client:
  ceph: drop negative child dentries before try pruning inode's alias