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

[deliverable/linux.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index e171f7b5f9e490c6fbcc07cdb5d4d12a80446c90..997f537cf3cc3677bb350b453d5e2c5e325471b5 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -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)