leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus

Browse Source
This commit is contained in:
Al Viro
2016-08-03 13:31:51 -04:00
parent 7d50a29fe4 f0fce87c36
commit 8ecfb75216
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/inode.c
View File

@@ -1722,7 +1722,6 @@ int dentry_needs_remove_privs(struct dentry *dentry)
mask |= ATTR_KILL_PRIV;
return mask;
}
EXPORT_SYMBOL(dentry_needs_remove_privs);
static int __remove_privs(struct dentry *dentry, int kill)
{
@@ -1742,8 +1741,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;
@@ -1751,7 +1750,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)