Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Dec 2009 20:51:05 +0000 (12:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Dec 2009 20:51:05 +0000 (12:51 -0800)
commita2770d86b33024f71df269fde2de096df89d6a48
treed232695efd62bcdcb2b3a9b413bccea66c0ecf32
parentb8a7f3cd7e8212e5c572178ff3b5a514861036a5
Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"

This reverts commit e9496ff46a20a8592fdc7bdaaf41b45eb808d310. Quoth Al:

 "it's dependent on a lot of other stuff not currently in mainline
  and badly broken with current fs/namespace.c.  Sorry, badly
  out-of-order cherry-pick from old queue.

  PS: there's a large pending series reworking the refcounting and
  lifetime rules for vfsmounts that will, among other things, allow to
  rip a subtree away _without_ dissolving connections in it, to be
  garbage-collected when all active references are gone.  It's
  considerably saner wrt "is the subtree busy" logics, but it's nowhere
  near being ready for merge at the moment; this changeset is one of the
  things becoming possible with that sucker, but it certainly shouldn't
  have been picked during this cycle.  My apologies..."

Noticed-by: Eric Paris <eparis@redhat.com>
Requested-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/namespace.c
fs/nfs/super.c
include/linux/mnt_namespace.h