2 files changed, 16 insertions, 0 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 977d8919cc69..5f0c52a07386 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -19,6 +19,7 @@ prototypes:
         void (*d_release)(struct dentry *);
         void (*d_iput)(struct dentry *, struct inode *);
         char *(*d_dname)((struct dentry *dentry, char *buffer, int buflen);
+        struct vfsmount *(*d_automount)(struct path *path);
 
 locking rules:
                 rename_lock     ->d_lock        may block       rcu-walk
@@ -29,6 +30,7 @@ d_delete:	no		yes		no		no
 d_release:      no              no              yes             no
 d_iput:         no              no              yes             no
 d_dname:        no              no              no              no
+d_automount:    no              no              yes             no
 
 --------------------------- inode_operations --------------------------- 
 prototypes:
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index cae6d27c9f5b..726a4f6fa3c9 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -864,6 +864,7 @@ struct dentry_operations {
         void (*d_release)(struct dentry *);
         void (*d_iput)(struct dentry *, struct inode *);
         char *(*d_dname)(struct dentry *, char *, int);
+        struct vfsmount *(*d_automount)(struct path *);
 };
 
   d_revalidate: called when the VFS needs to revalidate a dentry. This
@@ -930,6 +931,19 @@ struct dentry_operations {
         at the end of the buffer, and returns a pointer to the first char.
         dynamic_dname() helper function is provided to take care of this.
 
+  d_automount: called when an automount dentry is to be traversed (optional).
+        This should create a new VFS mount record, mount it on the directory
+        and return the record to the caller.  The caller is supplied with a
+        path parameter giving the automount directory to describe the automount
+        target and the parent VFS mount record to provide inheritable mount
+        parameters.  NULL should be returned if someone else managed to make
+        the automount first.  If the automount failed, then an error code
+        should be returned.
+
+        This function is only used if DCACHE_NEED_AUTOMOUNT is set on the
+        dentry.  This is set by __d_instantiate() if S_AUTOMOUNT is set on the
+        inode being added.
+
 Example :
 
 static char *pipefs_dname(struct dentry *dent, char *buffer, int buflen)