replace ->follow_link() with new method that could stay in RCU mode

[linux-block.git] / fs / configfs / symlink.c

diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index ec5c8325b503d1a1602863769ae43c067d13a047..b91c01ebb688fba60ec3cfbf71a7b7330e8a726a 100644 (file)
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -279,11 +279,16 @@ static int configfs_getlink(struct dentry *dentry, char * path)
 
 }
 
-static const char *configfs_follow_link(struct dentry *dentry, void **cookie)
+static const char *configfs_get_link(struct dentry *dentry,
+                                    struct inode *inode, void **cookie)
 {
-       unsigned long page = get_zeroed_page(GFP_KERNEL);
+       unsigned long page;
        int error;
 
+       if (!dentry)
+               return ERR_PTR(-ECHILD);
+
+       page = get_zeroed_page(GFP_KERNEL);
        if (!page)
                return ERR_PTR(-ENOMEM);
 
@@ -297,7 +302,7 @@ static const char *configfs_follow_link(struct dentry *dentry, void **cookie)
 }
 
 const struct inode_operations configfs_symlink_inode_operations = {
-       .follow_link = configfs_follow_link,
+       .get_link = configfs_get_link,
        .readlink = generic_readlink,
        .put_link = free_page_put_link,
        .setattr = configfs_setattr,