From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/namei.c       |    5 ++---
 kernel/auditsc.c |   10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff -puN kernel/auditsc.c~git-audit-fixup kernel/auditsc.c
--- devel/kernel/auditsc.c~git-audit-fixup	2006-02-06 22:28:24.000000000 -0800
+++ devel-akpm/kernel/auditsc.c	2006-02-06 22:28:24.000000000 -0800
@@ -29,6 +29,14 @@
  * this file -- see entry.S) is based on a GPL'd patch written by
  * okir@suse.de and Copyright 2003 SuSE Linux AG.
  *
+ * The support of additional filter rules compares (>, <, >=, <=) was
+ * added by Dustin Kirkland <dustin.kirkland@us.ibm.com>, 2005.
+ *
+ * Modified by Amy Griffis <amy.griffis@hp.com> to collect additional
+ * filesystem information.
+ *
+ * Subject and object context labeling support added by <danjones@us.ibm.com>
+ * and <dustin.kirkland@us.ibm.com> for LSPP certification compliance.
  */
 
 #include <linux/init.h>
@@ -36,6 +44,8 @@
 #include <asm/atomic.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/mount.h>
 #include <linux/socket.h>
 #include <linux/audit.h>
diff -puN fs/namei.c~git-audit-fixup fs/namei.c
--- devel/fs/namei.c~git-audit-fixup	2006-02-06 22:28:24.000000000 -0800
+++ devel-akpm/fs/namei.c	2006-02-06 22:28:53.000000000 -0800
@@ -1120,9 +1120,8 @@ static int fastcall do_path_lookup(int d
 	retval = link_path_walk(name, nd);
 out:
 	if (likely(retval == 0)) {
-		if (unlikely(current->audit_context && nd && nd->dentry &&
-				nd->dentry->d_inode))
-		audit_inode(name, nd->dentry->d_inode, flags);
+		if (nd && nd->dentry && nd->dentry->d_inode)
+			audit_inode(name, nd->dentry->d_inode, flags);
 	}
 	return retval;
 
_