X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Finode.c;h=258ec22bb298ff1c285a0dba581236c2a0d332bf;hb=01a05b337a5b647909e1d6670f57e7202318a5fb;hp=f1aef3482b0e4a2a884163d62c84606a14c945d6;hpb=257ba15cedf1288f0c96118d7e63947231d27278;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/inode.c b/fs/inode.c
index f1aef34..258ec22 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -8,7 +8,6 @@
 #include <linux/mm.h>
 #include <linux/dcache.h>
 #include <linux/init.h>
-#include <linux/quotaops.h>
 #include <linux/slab.h>
 #include <linux/writeback.h>
 #include <linux/module.h>
@@ -1206,12 +1205,8 @@ void generic_delete_inode(struct inode *inode)
 	inodes_stat.nr_inodes--;
 	spin_unlock(&inode_lock);
 
-	security_inode_delete(inode);
-
 	if (op->delete_inode) {
 		void (*delete)(struct inode *) = op->delete_inode;
-		if (!is_bad_inode(inode))
-			vfs_dq_init(inode);
 		/* Filesystems implementing their own
 		 * s_op->delete_inode are required to call
 		 * truncate_inode_pages and clear_inode()