diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 11:43:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 11:43:30 +1000 |
| commit | c483d69b2d42d746a7e1f6574a38d7b1a643c0ca (patch) | |
| tree | 8b549889f1289a174aed4b2d46f009e3ec39a7be /fs/omfs/inode.c | |
| parent | 071b2ce1fa20bf2dc7d77375ea91cf8241cfc33b (diff) | |
| parent | 9a906772183b579c576b3562cae87b7012dcd1c6 (diff) | |
Merge remote branch 'vfs/for-next'
Conflicts:
fs/nilfs2/super.c
fs/xfs/linux-2.6/xfs_super.c
Diffstat (limited to 'fs/omfs/inode.c')
| -rw-r--r-- | fs/omfs/inode.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index 089839a6cc64..56121debc22b 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, |