From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zeniv.linux.org.uk ([195.92.253.2]:39780 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040AbcHGDqi (ORCPT ); Sat, 6 Aug 2016 23:46:38 -0400 Date: Sun, 7 Aug 2016 04:46:28 +0100 From: Al Viro To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [git pull] vfs pile 3 Message-ID: <20160807034627.GN2356@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Assorted cleanups and fixes; in "trivial API change" department - ->d_compare() losing 'parent' argument. I'm not sure if I'd taken the right approach with the last commit; the thing is, fs/namei.c part has a trivial conflict with the userns changes already in mainline *and* the posted patch had been against the mainline. Sure, I could apply it to this branch, resolve that conflict and let you resolve the one that would induce on merge. Or I could backmerge from the point where userns changes went into mainline and apply as-is, with no conflicts for anyone. Or put it into a separate pull request after this pile gets merged. I went for the second variant (backmerge), but if you prefer the third one, just pull #for-linus-2 and I'll send a separate pull request for the last commit. Or just cherry-pick that last commit from #for-linus after having pulled #for-linus-2. The following changes since commit a867d7349e94b6409b08629886a819f802377e91: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace (2016-07-29 15:54:19 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus for you to fetch changes up to 6141b4d64295ec08a1b48c7fcac8a566658cd64f: fs: return EPERM on immutable inode (2016-08-03 13:38:11 -0400) ---------------------------------------------------------------- Al Viro (9): fold dentry_rcuwalk_invalidate() into its only remaining caller fold _d_rehash() and __d_rehash() together affs ->d_compare(): don't bother with ->d_inode cifs, msdos, vfat, hfs+: don't bother with parent in ->d_compare() get rid of 'parent' argument of ->d_compare() 9p: fix braino introduced in "9p: new helper - v9fs_parent_fid()" 9p: use clone_fid() Merge branch 'for-viro' of git://git.kernel.org/.../mszeredi/vfs into for-linus backmerge from mainline to avoid conflict in "fs: return EPERM on immutable inode" David Howells (1): cachefiles: Fix race between inactivating and culling a cache object Eryu Guan (1): fs: return EPERM on immutable inode Miklos Szeredi (3): vfs: fix deadlock in file_remove_privs() on overlayfs vfs: remove file_needs_remove_privs() vfs: make dentry_needs_remove_privs() internal Documentation/filesystems/Locking | 2 +- Documentation/filesystems/porting | 7 ++++ Documentation/filesystems/vfs.txt | 2 +- drivers/staging/lustre/lustre/llite/dcache.c | 2 +- fs/9p/fid.c | 26 +------------ fs/9p/fid.h | 9 ++++- fs/9p/vfs_inode.c | 6 +-- fs/9p/vfs_inode_dotl.c | 2 +- fs/9p/xattr.c | 4 +- fs/adfs/dir.c | 2 +- fs/affs/amigaffs.c | 4 +- fs/affs/namei.c | 12 +++--- fs/cachefiles/namei.c | 5 ++- fs/cifs/dir.c | 4 +- fs/dcache.c | 55 ++++++++-------------------- fs/efivarfs/super.c | 3 +- fs/fat/namei_msdos.c | 4 +- fs/fat/namei_vfat.c | 6 +-- fs/gfs2/inode.c | 2 +- fs/hfs/hfs_fs.h | 2 +- fs/hfs/string.c | 2 +- fs/hfsplus/hfsplus_fs.h | 3 +- fs/hfsplus/unicode.c | 4 +- fs/hpfs/dentry.c | 4 +- fs/inode.c | 7 ++-- fs/internal.h | 1 + fs/isofs/inode.c | 15 +++----- fs/isofs/namei.c | 2 +- fs/jfs/namei.c | 2 +- fs/namei.c | 2 +- fs/ncpfs/dir.c | 6 +-- fs/proc/proc_sysctl.c | 2 +- fs/utimes.c | 3 +- fs/xfs/xfs_ioctl.c | 2 +- include/linux/dcache.h | 2 +- include/linux/fs.h | 5 --- 36 files changed, 87 insertions(+), 134 deletions(-)