diff --git a/[refs] b/[refs] index dda095a954d1..b03fd6ef14ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c37650161a53c01ddd88587675f9a4adc909a73e +refs/heads/master: 56b0dacfa2b8416815a2f2a5f4f51e46be4cf14c diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c index 86464332e590..3368abd64bb5 100644 --- a/trunk/fs/inode.c +++ b/trunk/fs/inode.c @@ -235,7 +235,7 @@ void __destroy_inode(struct inode *inode) } EXPORT_SYMBOL(__destroy_inode); -void destroy_inode(struct inode *inode) +static void destroy_inode(struct inode *inode) { __destroy_inode(inode); if (inode->i_sb->s_op->destroy_inode) diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 0b03f490572f..0a5d83633884 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -2187,7 +2187,6 @@ extern void unlock_new_inode(struct inode *); extern void __iget(struct inode * inode); extern void iget_failed(struct inode *); extern void end_writeback(struct inode *); -extern void destroy_inode(struct inode *); extern void __destroy_inode(struct inode *); extern struct inode *new_inode(struct super_block *); extern int should_remove_suid(struct dentry *);