Commit e9193288 authored by Al Viro's avatar Al Viro

__inode_security_revalidate() never gets NULL opt_dentry

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2220c5b0
...@@ -274,11 +274,10 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent ...@@ -274,11 +274,10 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
* Try reloading inode security labels that have been marked as invalid. The * Try reloading inode security labels that have been marked as invalid. The
* @may_sleep parameter indicates when sleeping and thus reloading labels is * @may_sleep parameter indicates when sleeping and thus reloading labels is
* allowed; when set to false, returns -ECHILD when the label is * allowed; when set to false, returns -ECHILD when the label is
* invalid. The @opt_dentry parameter should be set to a dentry of the inode; * invalid. The @dentry parameter should be set to a dentry of the inode.
* when no dentry is available, set it to NULL instead.
*/ */
static int __inode_security_revalidate(struct inode *inode, static int __inode_security_revalidate(struct inode *inode,
struct dentry *opt_dentry, struct dentry *dentry,
bool may_sleep) bool may_sleep)
{ {
struct inode_security_struct *isec = inode->i_security; struct inode_security_struct *isec = inode->i_security;
...@@ -295,7 +294,7 @@ static int __inode_security_revalidate(struct inode *inode, ...@@ -295,7 +294,7 @@ static int __inode_security_revalidate(struct inode *inode,
* @opt_dentry is NULL and no dentry for this inode can be * @opt_dentry is NULL and no dentry for this inode can be
* found; in that case, continue using the old label. * found; in that case, continue using the old label.
*/ */
inode_doinit_with_dentry(inode, opt_dentry); inode_doinit_with_dentry(inode, dentry);
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment