Take ima_file_free() to proper place.

Al Viro · Al Viro · commit 89068c576bf3 · 2010-02-07T03:07:29.000-05:00
Hooks: Just Say No.

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/file_table.c b/fs/file_table.c
@@ -253,6 +253,7 @@ void __fput(struct file *file)
 	if (file->f_op && file->f_op->release)
 		file->f_op->release(inode, file);
 	security_file_free(file);
+	ima_file_free(file);
 	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
 		cdev_put(inode->i_cdev);
 	fops_put(file->f_op);
diff --git a/security/security.c b/security/security.c
@@ -666,8 +666,6 @@ int security_file_alloc(struct file *file)
 void security_file_free(struct file *file)
 {
 	security_ops->file_free_security(file);
-	if (file->f_dentry)
-		ima_file_free(file);
 }
 
 int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

Original file line number	Diff line number	Diff line change
`@@ -666,8 +666,6 @@ int security_file_alloc(struct file *file)`
`666`	`666`	`void security_file_free(struct file *file)`
`667`	`667`	`{`
`668`	`668`	`security_ops->file_free_security(file);`
`669`		`- if (file->f_dentry)`
`670`		`- ima_file_free(file);`
`671`	`669`	`}`
`672`	`670`
`673`	`671`	`int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)`