Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18

[linux-2.6] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 0ab26cbdacc01c5b894f99e163fd72893e9ad480..55a131230f94828eea51f54a56efe36a7ca0a9e4 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -159,7 +159,7 @@ char * getname(const char __user * filename)
 #ifdef CONFIG_AUDITSYSCALL
 void putname(const char *name)
 {
-       if (unlikely(current->audit_context))
+       if (unlikely(!audit_dummy_context()))
                audit_putname(name);
        else
                __putname(name);
@@ -1125,7 +1125,7 @@ static int fastcall do_path_lookup(int dfd, const char *name,
        retval = link_path_walk(name, nd);
 out:
        if (likely(retval == 0)) {
-               if (unlikely(current->audit_context && nd && nd->dentry &&
+               if (unlikely(!audit_dummy_context() && nd && nd->dentry &&
                                nd->dentry->d_inode))
                audit_inode(name, nd->dentry->d_inode);
        }