summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-08-03 19:31:51 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2016-08-03 19:31:51 +0200
commit8ecfb75216a71ba0e00e419ddafa52d12d965445 (patch)
treed0a5eae3b63156c71b3f5f3ba77648aa1322871a /include
parent9p: use clone_fid() (diff)
parentvfs: make dentry_needs_remove_privs() internal (diff)
downloadlinux-8ecfb75216a71ba0e00e419ddafa52d12d965445.tar.xz
linux-8ecfb75216a71ba0e00e419ddafa52d12d965445.zip
Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f65a6801f609..3f8167a49675 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2725,11 +2725,6 @@ extern struct inode *new_inode(struct super_block *sb);
extern void free_inode_nonrcu(struct inode *inode);
extern int should_remove_suid(struct dentry *);
extern int file_remove_privs(struct file *);
-extern int dentry_needs_remove_privs(struct dentry *dentry);
-static inline int file_needs_remove_privs(struct file *file)
-{
- return dentry_needs_remove_privs(file->f_path.dentry);
-}
extern void __insert_inode_hash(struct inode *, unsigned long hashval);
static inline void insert_inode_hash(struct inode *inode)