summaryrefslogtreecommitdiffstats
path: root/fs/inode.c
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2009-01-09 07:04:15 -0800
committerArjan van de Ven <arjan@linux.intel.com>2009-01-09 13:15:49 -0800
commitb32714ba29358a688ef337d5297bf4bdc9f596dc (patch)
tree7f7e7bbb7e7db106c012772e3c95d427b55d6a4b /fs/inode.c
parent7c51d57e9d7fbce89f79c41dc8da383101dbe9c6 (diff)
downloadop-kernel-dev-b32714ba29358a688ef337d5297bf4bdc9f596dc.zip
op-kernel-dev-b32714ba29358a688ef337d5297bf4bdc9f596dc.tar.gz
partial revert of asynchronous inode delete
let the core of this one bake in -next as well, but leave some of the infrastructure in place. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'fs/inode.c')
-rw-r--r--fs/inode.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 0013ac1..913ab2d 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1139,11 +1139,16 @@ EXPORT_SYMBOL(remove_inode_hash);
* I_FREEING is set so that no-one will take a new reference to the inode while
* it is being deleted.
*/
-static void generic_delete_inode_async(void *data, async_cookie_t cookie)
+void generic_delete_inode(struct inode *inode)
{
- struct inode *inode = data;
const struct super_operations *op = inode->i_sb->s_op;
+ list_del_init(&inode->i_list);
+ list_del_init(&inode->i_sb_list);
+ inode->i_state |= I_FREEING;
+ inodes_stat.nr_inodes--;
+ spin_unlock(&inode_lock);
+
security_inode_delete(inode);
if (op->delete_inode) {
@@ -1167,16 +1172,6 @@ static void generic_delete_inode_async(void *data, async_cookie_t cookie)
destroy_inode(inode);
}
-void generic_delete_inode(struct inode *inode)
-{
- list_del_init(&inode->i_list);
- list_del_init(&inode->i_sb_list);
- inode->i_state |= I_FREEING;
- inodes_stat.nr_inodes--;
- spin_unlock(&inode_lock);
- async_schedule_special(generic_delete_inode_async, inode, &inode->i_sb->s_async_list);
-}
-
EXPORT_SYMBOL(generic_delete_inode);
static void generic_forget_inode(struct inode *inode)
OpenPOWER on IntegriCloud