|
@@ -1740,8 +1740,8 @@ static int __remove_privs(struct dentry *dentry, int kill)
|
|
|
*/
|
|
|
int file_remove_privs(struct file *file)
|
|
|
{
|
|
|
- struct dentry *dentry = file->f_path.dentry;
|
|
|
- struct inode *inode = d_inode(dentry);
|
|
|
+ struct dentry *dentry = file_dentry(file);
|
|
|
+ struct inode *inode = file_inode(file);
|
|
|
int kill;
|
|
|
int error = 0;
|
|
|
|
|
@@ -1749,7 +1749,7 @@ int file_remove_privs(struct file *file)
|
|
|
if (IS_NOSEC(inode))
|
|
|
return 0;
|
|
|
|
|
|
- kill = file_needs_remove_privs(file);
|
|
|
+ kill = dentry_needs_remove_privs(dentry);
|
|
|
if (kill < 0)
|
|
|
return kill;
|
|
|
if (kill)
|