Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile #2 from Al Viro:
 "Next pile (and there'll be one or two more).

  The large piece in this one is getting rid of /proc/*/ns/* weirdness;
  among other things, it allows to (finally) make nameidata completely
  opaque outside of fs/namei.c, making for easier further cleanups in
  there"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  coda_venus_readdir(): use file_inode()
  fs/namei.c: fold link_path_walk() call into path_init()
  path_init(): don't bother with LOOKUP_PARENT in argument
  fs/namei.c: new helper (path_cleanup())
  path_init(): store the "base" pointer to file in nameidata itself
  make default ->i_fop have ->open() fail with ENXIO
  make nameidata completely opaque outside of fs/namei.c
  kill proc_ns completely
  take the targets of /proc/*/ns/* symlinks to separate fs
  bury struct proc_ns in fs/proc
  copy address of proc_ns_ops into ns_common
  new helpers: ns_alloc_inum/ns_free_inum
  make proc_ns_operations work with struct ns_common * instead of void *
  switch the rest of proc_ns_operations to working with &...->ns
  netns: switch ->get()/->put()/->install()/->inum() to working with &net->ns
  make mntns ->get()/->put()/->install()/->inum() work with &mnt_ns->ns
  common object embedded into various struct ....ns

diff --cc arch/ia64/kernel/perfmon.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/proc/internal.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/ipc_namespace.h
index e365d5ec69cba1bfedb7e35707c8943091711bdf,52a64012815141299487958b5aba8be12eb3c505..1eee6bcfcf76a43856088b6314c2a52c0b2f10e1
--- 1/include/linux/ipc_namespace.h
--- 2/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@@ -6,7 -6,17 +6,8 @@@
  #include <linux/rwsem.h>
  #include <linux/notifier.h>
  #include <linux/nsproxy.h>
+ #include <linux/ns_common.h>
  
 -/*
 - * ipc namespace events
 - */
 -#define IPCNS_MEMCHANGED   0x00000001   /* Notify lowmem size changed */
 -#define IPCNS_CREATED  0x00000002   /* Notify new ipc namespace created */
 -#define IPCNS_REMOVED  0x00000003   /* Notify ipc namespace removed */
 -
 -#define IPCNS_CALLBACK_PRI 0
 -
  struct user_namespace;
  
  struct ipc_ids {

diff --cc init/main.c
index 747ecc4c0a1936494fc2401a90fbc3e09a31148d,40240c8e31e804c1c6508545c998814d134c0636..61b993767db53e8401dc1223fa6e028f7edafd74
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -78,7 -78,7 +78,8 @@@
  #include <linux/context_tracking.h>
  #include <linux/random.h>
  #include <linux/list.h>
 +#include <linux/integrity.h>
+ #include <linux/proc_ns.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>

diff --cc ipc/namespace.c
index 1a3ffd40356e37d0270c18fde4765c50dd6872a8,382e2aa42d8aac77692702d50dd9de4ffaec0e2f..068caf18d56509711e46b47b25a363254d681abe
--- 1/ipc/namespace.c
--- 2/ipc/namespace.c
+++ b/ipc/namespace.c
@@@ -96,8 -114,13 +97,8 @@@ static void free_ipc_ns(struct ipc_name
        shm_exit_ns(ns);
        atomic_dec(&nr_ipc_ns);
  
 -      /*
 -       * Do the ipcns removal notification after decrementing nr_ipc_ns in
 -       * order to have a correct value when recomputing msgmni.
 -       */
 -      ipcns_notify(IPCNS_REMOVED);
        put_user_ns(ns->user_ns);
-       proc_free_inum(ns->proc_inum);
+       ns_free_inum(&ns->ns);
        kfree(ns);
  }
  

diff --cc kernel/pid.c
Simple merge

diff --cc kernel/pid_namespace.c
Simple merge

diff --cc net/Makefile
Simple merge

diff --cc net/socket.c
Simple merge