Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / include / linux / lsm_hooks.h

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index f014f25..9429f05 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -315,7 +315,8 @@
  * @inode_follow_link:
  *     Check permission to follow a symbolic link when looking up a pathname.
  *     @dentry contains the dentry structure for the link.
- *     @nd contains the nameidata structure for the parent directory.
+ *     @inode contains the inode, which itself is not stable in RCU-walk
+ *     @rcu indicates whether we are in RCU-walk mode.
  *     Return 0 if permission is granted.
  * @inode_permission:
  *     Check permission before accessing an inode.  This hook is called by the
@@ -1397,7 +1398,8 @@ union security_list_options {
                                struct inode *new_dir,
                                struct dentry *new_dentry);
        int (*inode_readlink)(struct dentry *dentry);
-       int (*inode_follow_link)(struct dentry *dentry, struct nameidata *nd);
+       int (*inode_follow_link)(struct dentry *dentry, struct inode *inode,
+                                bool rcu);
        int (*inode_permission)(struct inode *inode, int mask);
        int (*inode_setattr)(struct dentry *dentry, struct iattr *attr);
        int (*inode_getattr)(const struct path *path);