Skip to content

Commit

Permalink
Revert "Avoid ELOOP on auto-mounted snapshots"
Browse files Browse the repository at this point in the history
This reverts commit 7afcf5b 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
  • Loading branch information
behlendorf committed Jan 9, 2013
1 parent 4cec9b2 commit 1c50c99
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions module/zfs/zpl_ctldir.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,6 @@ zpl_snapdir_automount(struct path *path)
if (error)
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
Expand Down

0 comments on commit 1c50c99

Please sign in to comment.