summaryrefslogtreecommitdiff
path: root/fs/omfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-06 10:12:01 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:48:05 -0400
commit69c9e750176b409559b2361fbb28fa7bbf3c5461 (patch)
tree021b31a5b132d0b86ddc1c10891d0739a542e63f /fs/omfs
parent9df2f85128def59185f8a1c584f8af41df17405a (diff)
downloadlinux-3.10-69c9e750176b409559b2361fbb28fa7bbf3c5461.tar.gz
linux-3.10-69c9e750176b409559b2361fbb28fa7bbf3c5461.tar.bz2
linux-3.10-69c9e750176b409559b2361fbb28fa7bbf3c5461.zip
switch omfs to ->evict_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/omfs')
-rw-r--r--fs/omfs/inode.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 089839a6cc6..56121debc22 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -175,9 +175,13 @@ int omfs_sync_inode(struct inode *inode)
* called when an entry is deleted, need to clear the bits in the
* bitmaps.
*/
-static void omfs_delete_inode(struct inode *inode)
+static void omfs_evict_inode(struct inode *inode)
{
truncate_inode_pages(&inode->i_data, 0);
+ end_writeback(inode);
+
+ if (inode->i_nlink)
+ return;
if (S_ISREG(inode->i_mode)) {
inode->i_size = 0;
@@ -185,7 +189,6 @@ static void omfs_delete_inode(struct inode *inode)
}
omfs_clear_range(inode->i_sb, inode->i_ino, 2);
- clear_inode(inode);
}
struct inode *omfs_iget(struct super_block *sb, ino_t ino)
@@ -284,7 +287,7 @@ static int omfs_statfs(struct dentry *dentry, struct kstatfs *buf)
static const struct super_operations omfs_sops = {
.write_inode = omfs_write_inode,
- .delete_inode = omfs_delete_inode,
+ .evict_inode = omfs_evict_inode,
.put_super = omfs_put_super,
.statfs = omfs_statfs,
.show_options = generic_show_options,