Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -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)

fs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/fs.h

+0 −5
Original line number Diff line number Diff line
@@ -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)