diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 13:53:08 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 13:53:08 +0200 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /arch/s390/hypfs/inode.c | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'arch/s390/hypfs/inode.c')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 6b120f073043..98a4a4c267a7 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -117,10 +117,10 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) return ret; } -static void hypfs_drop_inode(struct inode *inode) +static void hypfs_evict_inode(struct inode *inode) { + end_writeback(inode); kfree(inode->i_private); - generic_delete_inode(inode); } static int hypfs_open(struct inode *inode, struct file *filp) @@ -460,7 +460,7 @@ static struct file_system_type hypfs_type = { static const struct super_operations hypfs_s_ops = { .statfs = simple_statfs, - .drop_inode = hypfs_drop_inode, + .evict_inode = hypfs_evict_inode, .show_options = hypfs_show_options, }; |