From 9329a42be04f2d1109027e383d01a8ff1b9ec15d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 5 Jun 2010 21:20:32 -0400 Subject: [PATCH] --- yaml --- r: 207549 b: refs/heads/master c: 0f3f63a4700d7c5aed51491b0113a257cf290a56 h: refs/heads/master i: 207547: b3473f9ba39d70f127b1f05cb983a6a2432559e2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/spufs/inode.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b0c0ca275207..0e9346fd4f7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e8268c7bae538ccb8b7eccc817c1c28bcd4da2 +refs/heads/master: 0f3f63a4700d7c5aed51491b0113a257cf290a56 diff --git a/trunk/arch/powerpc/platforms/cell/spufs/inode.c b/trunk/arch/powerpc/platforms/cell/spufs/inode.c index 32625f366fb5..5dec408d6703 100644 --- a/trunk/arch/powerpc/platforms/cell/spufs/inode.c +++ b/trunk/arch/powerpc/platforms/cell/spufs/inode.c @@ -143,15 +143,14 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry, } static void -spufs_delete_inode(struct inode *inode) +spufs_evict_inode(struct inode *inode) { struct spufs_inode_info *ei = SPUFS_I(inode); - + end_writeback(inode); if (ei->i_ctx) put_spu_context(ei->i_ctx); if (ei->i_gang) put_spu_gang(ei->i_gang); - clear_inode(inode); } static void spufs_prune_dir(struct dentry *dir) @@ -779,8 +778,7 @@ spufs_fill_super(struct super_block *sb, void *data, int silent) .alloc_inode = spufs_alloc_inode, .destroy_inode = spufs_destroy_inode, .statfs = simple_statfs, - .delete_inode = spufs_delete_inode, - .drop_inode = generic_delete_inode, + .evict_inode = spufs_evict_inode, .show_options = generic_show_options, };