3 files changed, 16 insertions, 13 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 4fba54b9fcec..619af9bfdcb3 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -51,7 +51,6 @@ prototypes:
                         struct inode *, struct dentry *, unsigned int);
         int (*readlink) (struct dentry *, char __user *,int);
         const char *(*get_link) (struct dentry *, struct inode *, void **);
-        void (*put_link) (struct inode *, void *);
         void (*truncate) (struct inode *);
         int (*permission) (struct inode *, int, unsigned int);
         int (*get_acl)(struct inode *, int);
@@ -84,7 +83,6 @@ rename:		yes (all)	(see below)
 rename2:        yes (all)       (see below)
 readlink:       no
 get_link:       no
-put_link:       no
 setattr:        yes
 permission:     no (may not block if called in rcu-walk mode)
 get_acl:        no
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index cf92a8c55594..0f88e6020487 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -515,3 +515,9 @@ in your dentry operations instead.
                 * ->get_link() gets inode as a separate argument
                 * ->get_link() may be called in RCU mode - in that case NULL
                   dentry is passed
+--
+[mandatory]
+        ->get_link() gets struct delayed_call *done now, and should do
+        set_delayed_call() where it used to set *cookie.
+        ->put_link() is gone - just give the destructor to set_delayed_call()
+        in ->get_link().
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 8c6f07ad373a..b02a7d598258 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -350,8 +350,8 @@ struct inode_operations {
         int (*rename2) (struct inode *, struct dentry *,
                         struct inode *, struct dentry *, unsigned int);
         int (*readlink) (struct dentry *, char __user *,int);
-        const char *(*follow_link) (struct dentry *, void **);
-        void (*put_link) (struct inode *, void *);
+        const char *(*get_link) (struct dentry *, struct inode *,
+                                 struct delayed_call *);
         int (*permission) (struct inode *, int);
         int (*get_acl)(struct inode *, int);
         int (*setattr) (struct dentry *, struct iattr *);
@@ -434,20 +434,19 @@ otherwise noted.
   readlink: called by the readlink(2) system call. Only required if
         you want to support reading symbolic links
 
-  follow_link: called by the VFS to follow a symbolic link to the
+  get_link: called by the VFS to follow a symbolic link to the
         inode it points to.  Only required if you want to support
         symbolic links.  This method returns the symlink body
         to traverse (and possibly resets the current position with
         nd_jump_link()).  If the body won't go away until the inode
         is gone, nothing else is needed; if it needs to be otherwise
-        pinned, the data needed to release whatever we'd grabbed
-        is to be stored in void * variable passed by address to
-        follow_link() instance.
-
-  put_link: called by the VFS to release resources allocated by
-        follow_link().  The cookie stored by follow_link() is passed
-        to this method as the last parameter; only called when
-        cookie isn't NULL.
+        pinned, arrange for its release by having get_link(..., ..., done)
+        do set_delayed_call(done, destructor, argument).
+        In that case destructor(argument) will be called once VFS is
+        done with the body you've returned.
+        May be called in RCU mode; that is indicated by NULL dentry
+        argument.  If request can't be handled without leaving RCU mode,
+        have it return ERR_PTR(-ECHILD).
 
   permission: called by the VFS to check for access rights on a POSIX-like
         filesystem.