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

2 files changed, 4 insertions, 4 deletions

diff --git a/fs/inode.c b/fs/inode.c
index e171f7b5f9e4..997f537cf3cc 100644
--- 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)
diff --git a/fs/internal.h b/fs/internal.h
index cef0913e5d41..cc5a530e4f06 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -117,6 +117,7 @@ extern int vfs_open(const struct path *, struct file *, const struct cred *);
  */
 extern long prune_icache_sb(struct super_block *sb, struct shrink_control *sc);
 extern void inode_add_lru(struct inode *inode);
+extern int dentry_needs_remove_privs(struct dentry *dentry);
 
 /*
  * fs-writeback.c