Commit 2e00c97e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

vfs: add __destroy_inode 



When we want to tear down an inode that lost the add to the cache race
in XFS we must not call into ->destroy_inode because that would delete
the inode that won the race from the inode cache radix tree.

This patch provides the __destroy_inode helper needed to fix this,
the actual fix will be in th next patch.  As XFS was the only reason
destroy_inode was exported we shift the export to the new __destroy_inode.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
parent 54e34621

fs/inode.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -229,7 +229,7 @@ static struct inode *alloc_inode(struct super_block *sb) 
	return inode;

	return inode;

}

}





void destroy_inode(struct inode *inode)

void __destroy_inode(struct inode *inode)

{

{

	BUG_ON(inode_has_buffers(inode));

	BUG_ON(inode_has_buffers(inode));

	ima_inode_free(inode);

	ima_inode_free(inode);
@@ -241,13 +241,17 @@ void destroy_inode(struct inode *inode) 
	if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED)

	if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED)

		posix_acl_release(inode->i_default_acl);

		posix_acl_release(inode->i_default_acl);

#endif

#endif

}

EXPORT_SYMBOL(__destroy_inode);



void destroy_inode(struct inode *inode)

{

	__destroy_inode(inode);

	if (inode->i_sb->s_op->destroy_inode)

	if (inode->i_sb->s_op->destroy_inode)

		inode->i_sb->s_op->destroy_inode(inode);

		inode->i_sb->s_op->destroy_inode(inode);

	else

	else

		kmem_cache_free(inode_cachep, (inode));

		kmem_cache_free(inode_cachep, (inode));

}

}

EXPORT_SYMBOL(destroy_inode);







/*

/*

 * These are initializations that only need to be done

 * These are initializations that only need to be done

include/linux/fs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2164,6 +2164,7 @@ extern void __iget(struct inode * inode); 
extern void iget_failed(struct inode *);

extern void iget_failed(struct inode *);

extern void clear_inode(struct inode *);

extern void clear_inode(struct inode *);

extern void destroy_inode(struct inode *);

extern void destroy_inode(struct inode *);

extern void __destroy_inode(struct inode *);

extern struct inode *new_inode(struct super_block *);

extern struct inode *new_inode(struct super_block *);

extern int should_remove_suid(struct dentry *);

extern int should_remove_suid(struct dentry *);

extern int file_remove_suid(struct file *);

extern int file_remove_suid(struct file *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE