From 62012a6d308713f4f7ebdeb19aa808431b7ce3c2 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Wed, 16 Mar 2011 22:48:43 -0400
Subject: [PATCH] --- yaml --- r: 329103 b: refs/heads/master c:
 4199d35cbc90c15db447d115bd96ffa5f1d60d3a h: refs/heads/master i:   329101:
 bd82031db608ce9eeabe7114cdb871cf8914de75   329099:
 b7feba37ff6d455fad42cde9774fcda21d2ddcd6   329095:
 4902986c45c7186213b84e8f64b80f9287b6c6e1   329087:
 96830dfce8cf23d54072e1195ed98f4cfbe8462f v: v3

---
 [refs]                | 2 +-
 trunk/fs/file_table.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 173497a9e833..042e180a8386 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ab51f3721f7abdf92d89cb79d3d6c0062ddc14b
+refs/heads/master: 4199d35cbc90c15db447d115bd96ffa5f1d60d3a
diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c
index 701985e4ccda..a41f23f90b17 100644
--- a/trunk/fs/file_table.c
+++ b/trunk/fs/file_table.c
@@ -243,10 +243,10 @@ static void __fput(struct file *file)
 		if (file->f_op && file->f_op->fasync)
 			file->f_op->fasync(-1, file, 0);
 	}
+	ima_file_free(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 &&
 		     !(file->f_mode & FMODE_PATH))) {
 		cdev_put(inode->i_cdev);