Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
inode.c
diff --git
a/kernel/fs/inode.c
b/kernel/fs/inode.c
index
1be5f90
..
b0edef5
100644
(file)
--- a/
kernel/fs/inode.c
+++ b/
kernel/fs/inode.c
@@
-1733,8
+1733,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;
@@
-1742,7
+1742,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)