diff --git a/[refs] b/[refs] index 4ad96c6949b7..ef1e07d8e5fe 100644 --- 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 index 93e7a5ecbc26..7a1bea9cb8ee 100644 --- 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 index 3c23c1dcb1bd..2b1254771e46 100644 --- 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);