diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-07 11:42:26 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:48:24 -0400 |
commit | 4ec70c9b46b032e7f1b41b543c607d6a33b78a1a (patch) | |
tree | ab2f2509a13845130fa0a3a28f4a9944bb761e05 /fs/exofs/inode.c | |
parent | 845a2cc0507055278e0fa722ed0f8c791b7401dd (diff) | |
download | op-kernel-dev-4ec70c9b46b032e7f1b41b543c607d6a33b78a1a.zip op-kernel-dev-4ec70c9b46b032e7f1b41b543c607d6a33b78a1a.tar.gz |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index ccd0ce3..088cb47 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) * from the OSD here. We make sure the object was created before we try and * delete it. */ -void exofs_delete_inode(struct inode *inode) +void exofs_evict_inode(struct inode *inode) { struct exofs_i_info *oi = exofs_i(inode); struct super_block *sb = inode->i_sb; @@ -1318,11 +1318,11 @@ void exofs_delete_inode(struct inode *inode) truncate_inode_pages(&inode->i_data, 0); /* TODO: should do better here */ - if (is_bad_inode(inode)) + if (inode->i_nlink || is_bad_inode(inode)) goto no_delete; inode->i_size = 0; - clear_inode(inode); + end_writeback(inode); /* if we are deleting an obj that hasn't been created yet, wait */ if (!obj_created(oi)) { @@ -1353,5 +1353,5 @@ void exofs_delete_inode(struct inode *inode) return; no_delete: - clear_inode(inode); + end_writeback(inode); } |