Sync with AdvFS/NetBSD-current 2014-09-01