switch ufs to ->evict_inode()

PATCH In review Al Viro 1 participant 1 message Jun 8, 2010 VFS

lore

Share & tools

lore

Al Viro

author

2010-06-08 22:18 UTC #0 lore raw

PATCH 19/58 switch ufs to ->evict_inode()

Signed-off-by Al Viro <[email protected]>

---
 fs/ufs/ialloc.c |    2 --
 fs/ufs/inode.c  |   43 ++++++++++++++++++++++++++-----------------
 fs/ufs/super.c  |    2 +-
 fs/ufs/ufs.h    |    2 +-
 4 files changed, 28 insertions(+), 21 deletions(-)

fs/ufs/ialloc.c +0 -2

index 594480e..428017e 100644
@@ -94,8 +94,6 @@ void ufs_free_inode (struct inode * inode)
 
 	is_directory = S_ISDIR(inode->i_mode);
 
-	clear_inode (inode);
-
 	if (ubh_isclr (UCPI_UBH(ucpi), ucpi->c_iusedoff, bit))
 		ufs_error(sb, "ufs_free_inode", "bit already cleared for inode %u", ino);
 	else {

fs/ufs/inode.c +26 ~~-17~~

50 lines not on this page · raw message

fs/ufs/super.c +1 -1

index 3ec5a9e..d510c1b 100644
@@ -1440,7 +1440,7 @@ static const struct super_operations ufs_super_ops = {
 	.alloc_inode	= ufs_alloc_inode,
 	.destroy_inode	= ufs_destroy_inode,
 	.write_inode	= ufs_write_inode,
-	.delete_inode	= ufs_delete_inode,
+	.evict_inode	= ufs_evict_inode,
 	.put_super	= ufs_put_super,
 	.write_super	= ufs_write_super,
 	.sync_fs	= ufs_sync_fs,

fs/ufs/ufs.h +1 -1

index 179ae6b..c08782e 100644
@@ -108,7 +108,7 @@ extern struct inode * ufs_new_inode (struct inode *, int);
 extern struct inode *ufs_iget(struct super_block *, unsigned long);
 extern int ufs_write_inode (struct inode *, struct writeback_control *);
 extern int ufs_sync_inode (struct inode *);
-extern void ufs_delete_inode (struct inode *);
+extern void ufs_evict_inode (struct inode *);
 extern struct buffer_head * ufs_bread (struct inode *, unsigned, int, int *);
 extern int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buffer_head *bh_result, int create);

Signature · 1 line

1.5.6.5