Revert "Avoid ELOOP on auto-mounted snapshots"
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 9 Jan 2013 19:09:06 +0000 (11:09 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 9 Jan 2013 19:24:47 +0000 (11:24 -0800)
This reverts commit 7afcf5b1da83549bfba70a61fae7a00eaa63c2b0 which
accidentally introduced a regression with the .zfs snapshot directory.
While the updated code still does correctly mount the requested
snapshot.  It updates the vfsmount such that it references the
original dataset vfsmount.  The result is that the snapshot itself
isn't visible.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #816

module/zfs/zpl_ctldir.c

index a2d8fa9..7dfaf6e 100644 (file)
@@ -357,13 +357,6 @@ zpl_snapdir_automount(struct path *path)
                return ERR_PTR(error);
 
        /*
-        * Ensure path->dentry points to the dentry for the root of the
-        * newly-mounted snapshot, otherwise this function may be called
-        * repeatedly which can lead to an incorrect ELOOP error return.
-        */
-       follow_up(path);
-
-       /*
         * Rather than returning the new vfsmount for the snapshot we must
         * return NULL to indicate a mount collision.  This is done because
         * the user space mount calls do_add_mount() which adds the vfsmount