All of lore.kernel.org
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [git pull] vfs pile 3
Date: Sun, 7 Aug 2016 04:46:28 +0100	[thread overview]
Message-ID: <20160807034627.GN2356@ZenIV.linux.org.uk> (raw)

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(-)

             reply	other threads:[~2016-08-07  3:46 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-07  3:46 Al Viro [this message]
2016-08-07 14:00 ` [git pull] vfs pile 3 Linus Torvalds
  -- strict thread matches above, loose matches on Subject: below --
2018-06-04  1:12 [git pull] vfs, " Al Viro
2016-12-23  0:03 [git pull] vfs " Al Viro
2016-12-23 11:44 ` Al Viro
2012-10-13  0:20 Al Viro
2012-10-13  7:20 ` Marco Stornelli
2012-10-13  7:51   ` Al Viro
2012-10-13  7:52     ` Marco Stornelli
2012-10-13 15:48     ` Christoph Hellwig
2012-10-13 16:01       ` Al Viro
2012-10-13 16:04         ` Christoph Hellwig
2012-10-13 17:07           ` Al Viro
2012-10-14  9:59             ` Marco Stornelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160807034627.GN2356@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.