Commit 8ecfb752 authored by Al Viro's avatar Al Viro

Merge branch 'for-viro' of...

Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
parents 7d50a29f f0fce87c
...@@ -1722,7 +1722,6 @@ int dentry_needs_remove_privs(struct dentry *dentry) ...@@ -1722,7 +1722,6 @@ int dentry_needs_remove_privs(struct dentry *dentry)
mask |= ATTR_KILL_PRIV; mask |= ATTR_KILL_PRIV;
return mask; return mask;
} }
EXPORT_SYMBOL(dentry_needs_remove_privs);
static int __remove_privs(struct dentry *dentry, int kill) static int __remove_privs(struct dentry *dentry, int kill)
{ {
...@@ -1742,8 +1741,8 @@ 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) int file_remove_privs(struct file *file)
{ {
struct dentry *dentry = file->f_path.dentry; struct dentry *dentry = file_dentry(file);
struct inode *inode = d_inode(dentry); struct inode *inode = file_inode(file);
int kill; int kill;
int error = 0; int error = 0;
...@@ -1751,7 +1750,7 @@ int file_remove_privs(struct file *file) ...@@ -1751,7 +1750,7 @@ int file_remove_privs(struct file *file)
if (IS_NOSEC(inode)) if (IS_NOSEC(inode))
return 0; return 0;
kill = file_needs_remove_privs(file); kill = dentry_needs_remove_privs(dentry);
if (kill < 0) if (kill < 0)
return kill; return kill;
if (kill) if (kill)
......
...@@ -117,6 +117,7 @@ extern int vfs_open(const struct path *, struct file *, const struct cred *); ...@@ -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 long prune_icache_sb(struct super_block *sb, struct shrink_control *sc);
extern void inode_add_lru(struct inode *inode); extern void inode_add_lru(struct inode *inode);
extern int dentry_needs_remove_privs(struct dentry *dentry);
/* /*
* fs-writeback.c * fs-writeback.c
......
...@@ -2725,11 +2725,6 @@ extern struct inode *new_inode(struct super_block *sb); ...@@ -2725,11 +2725,6 @@ extern struct inode *new_inode(struct super_block *sb);
extern void free_inode_nonrcu(struct inode *inode); extern void free_inode_nonrcu(struct inode *inode);
extern int should_remove_suid(struct dentry *); extern int should_remove_suid(struct dentry *);
extern int file_remove_privs(struct file *); 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); extern void __insert_inode_hash(struct inode *, unsigned long hashval);
static inline void insert_inode_hash(struct inode *inode) static inline void insert_inode_hash(struct inode *inode)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment