projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v4.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[cascardo/linux.git]
/
fs
/
inode.c
diff --git
a/fs/inode.c
b/fs/inode.c
index
ad44554
..
7e3ef3a
100644
(file)
--- a/
fs/inode.c
+++ b/
fs/inode.c
@@
-1729,7
+1729,6
@@
int dentry_needs_remove_privs(struct dentry *dentry)
mask |= ATTR_KILL_PRIV;
return mask;
}
mask |= ATTR_KILL_PRIV;
return mask;
}
-EXPORT_SYMBOL(dentry_needs_remove_privs);
static int __remove_privs(struct dentry *dentry, int kill)
{
static int __remove_privs(struct dentry *dentry, int kill)
{
@@
-1749,8
+1748,8
@@
static int __remove_privs(struct dentry *dentry, int kill)
*/
int file_remove_privs(struct file *file)
{
*/
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;
int kill;
int error = 0;
@@
-1758,7
+1757,7
@@
int file_remove_privs(struct file *file)
if (IS_NOSEC(inode))
return 0;
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)
if (kill < 0)
return kill;
if (kill)