---

yaml --- r: 207581 b: refs/heads/master c: 07958f9 h: refs/heads/master i: 207579: a6f0992 v: v3
git-mirror · Aug 9, 2010 · 20571c7 · 20571c7
1 parent 72c0f61
commit 20571c7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0930fcc1ee2f0a810b938bc283a3a262d7adccbb
+refs/heads/master: 07958f9f5b9e8422c15368a1733a52ea99009896
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
@@ -335,8 +335,6 @@ static void evict(struct inode *inode, int delete)
 
 	if (op->evict_inode) {
 		op->evict_inode(inode);
-	} else if (delete && op->delete_inode) {
-		op->delete_inode(inode);
 	} else {
 		if (inode->i_data.nrpages)
 			truncate_inode_pages(&inode->i_data, 0);

diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
@@ -1564,7 +1564,6 @@ struct super_operations {
 	int (*write_inode) (struct inode *, struct writeback_control *wbc);
 	void (*drop_inode) (struct inode *);
 	void (*evict_inode) (struct inode *);
-	void (*delete_inode) (struct inode *);
 	void (*put_super) (struct super_block *);
 	void (*write_super) (struct super_block *);
 	int (*sync_fs)(struct super_block *sb, int wait);