aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exofs/inode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-07 11:42:26 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:48:24 -0400
commit4ec70c9b46b032e7f1b41b543c607d6a33b78a1a (patch)
treeab2f2509a13845130fa0a3a28f4a9944bb761e05 /fs/exofs/inode.c
parent845a2cc0507055278e0fa722ed0f8c791b7401dd (diff)
convert exofs to ->evict_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/exofs/inode.c')
-rw-r--r--fs/exofs/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index ccd0ce3eea75..088cb476b68a 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -1307,7 +1307,7 @@ static void delete_done(struct exofs_io_state *ios, void *p)
1307 * from the OSD here. We make sure the object was created before we try and 1307 * from the OSD here. We make sure the object was created before we try and
1308 * delete it. 1308 * delete it.
1309 */ 1309 */
1310void exofs_delete_inode(struct inode *inode) 1310void exofs_evict_inode(struct inode *inode)
1311{ 1311{
1312 struct exofs_i_info *oi = exofs_i(inode); 1312 struct exofs_i_info *oi = exofs_i(inode);
1313 struct super_block *sb = inode->i_sb; 1313 struct super_block *sb = inode->i_sb;
@@ -1318,11 +1318,11 @@ void exofs_delete_inode(struct inode *inode)
1318 truncate_inode_pages(&inode->i_data, 0); 1318 truncate_inode_pages(&inode->i_data, 0);
1319 1319
1320 /* TODO: should do better here */ 1320 /* TODO: should do better here */
1321 if (is_bad_inode(inode)) 1321 if (inode->i_nlink || is_bad_inode(inode))
1322 goto no_delete; 1322 goto no_delete;
1323 1323
1324 inode->i_size = 0; 1324 inode->i_size = 0;
1325 clear_inode(inode); 1325 end_writeback(inode);
1326 1326
1327 /* if we are deleting an obj that hasn't been created yet, wait */ 1327 /* if we are deleting an obj that hasn't been created yet, wait */
1328 if (!obj_created(oi)) { 1328 if (!obj_created(oi)) {
@@ -1353,5 +1353,5 @@ void exofs_delete_inode(struct inode *inode)
1353 return; 1353 return;
1354 1354
1355no_delete: 1355no_delete:
1356 clear_inode(inode); 1356 end_writeback(inode);
1357} 1357}