From f93d174fdd823bcbc9380db127d6fbe71b3b1263 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 7 Aug 2009 14:38:29 -0300
Subject: [PATCH] --- yaml --- r: 156505 b: refs/heads/master c:
 2e00c97e2c1d2ffc9e26252ca26b237678b0b772 h: refs/heads/master i:   156503:
 bb4f5b455106d67812169d00a6a818c0e22f8970 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/inode.c         | 10 +++++++---
 trunk/include/linux/fs.h |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d8767faf6f2b..1d50a927faf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54e346215e4fe2ca8c94c54e546cc61902060510
+refs/heads/master: 2e00c97e2c1d2ffc9e26252ca26b237678b0b772
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index af2c05235cc8..ae7b67e48661 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -229,7 +229,7 @@ static struct inode *alloc_inode(struct super_block *sb)
 	return inode;
 }
 
-void destroy_inode(struct inode *inode)
+void __destroy_inode(struct inode *inode)
 {
 	BUG_ON(inode_has_buffers(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)
 		posix_acl_release(inode->i_default_acl);
 #endif
+}
+EXPORT_SYMBOL(__destroy_inode);
+
+void destroy_inode(struct inode *inode)
+{
+	__destroy_inode(inode);
 	if (inode->i_sb->s_op->destroy_inode)
 		inode->i_sb->s_op->destroy_inode(inode);
 	else
 		kmem_cache_free(inode_cachep, (inode));
 }
-EXPORT_SYMBOL(destroy_inode);
-
 
 /*
  * These are initializations that only need to be done
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 0c3b5e58a986..67888a9e0655 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -2164,6 +2164,7 @@ extern void __iget(struct inode * inode);
 extern void iget_failed(struct inode *);
 extern void clear_inode(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 *);
 extern int file_remove_suid(struct file *);