[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20090330143239.cfc76a54.akpm@linux-foundation.org>
Date: Mon, 30 Mar 2009 14:32:39 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Dmitri Vorobiev <dmitri.vorobiev@...ial.com>
Cc: linux-kernel@...r.kernel.org, dmitri.vorobiev@...ial.com
Subject: Re: [PATCH 3/3] Restrict definition of a static function in
kernel/auditsc.c
On Wed, 18 Mar 2009 23:49:27 +0200
Dmitri Vorobiev <dmitri.vorobiev@...ial.com> wrote:
> The function 'audit_set_auditable' in kernel/auditsc.c is called
> only when the CONFIG_AUDIT_TREE option is set. Therefore, the
> following warning may be produced:
>
> kernel/auditsc.c:745: warning: 'audit_set_auditable' defined but not used
>
> This patch fixes the warning by moving the function definition under an
> appropriate preprocessor construct.
>
> Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@...ial.com>
> ---
> kernel/auditsc.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 8cbddff..bac40d0 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -741,6 +741,7 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx)
> rcu_read_unlock();
> }
>
> +#ifdef CONFIG_AUDIT_TREE
> static void audit_set_auditable(struct audit_context *ctx)
> {
> if (!ctx->prio) {
> @@ -748,6 +749,7 @@ static void audit_set_auditable(struct audit_context *ctx)
> ctx->current_state = AUDIT_RECORD_CONTEXT;
> }
> }
> +#endif
>
> static inline struct audit_context *audit_get_context(struct task_struct *tsk,
> int return_valid,
I already fixed this with the (IMO superior) patch below.
The patch was sent to the audit maintainers on Feb 11 and was resent on
March 4 and was both times ignored, along with the other two audit
patches I sent.
Bugger it, I'm fed up with this. I'll merge them myself.
From: Andrew Morton <akpm@...ux-foundation.org>
kernel/auditsc.c:745: warning: 'audit_set_auditable' defined but not used
Reported-by: Rakib Mullick <rakib.mullick@...il.com>
Cc: Valdis.Kletnieks@...edu
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Al Viro <viro@...iv.linux.org.uk>
Cc: Eric Paris <eparis@...hat.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
kernel/auditsc.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff -puN kernel/auditsc.c~kernel-auditscc-fix-warning kernel/auditsc.c
--- a/kernel/auditsc.c~kernel-auditscc-fix-warning
+++ a/kernel/auditsc.c
@@ -364,6 +364,15 @@ static int grow_tree_refs(struct audit_c
ctx->tree_count = 31;
return 1;
}
+
+static void audit_set_auditable(struct audit_context *ctx)
+{
+ if (!ctx->prio) {
+ ctx->prio = 1;
+ ctx->current_state = AUDIT_RECORD_CONTEXT;
+ }
+}
+
#endif
static void unroll_tree_refs(struct audit_context *ctx,
@@ -741,14 +750,6 @@ void audit_filter_inodes(struct task_str
rcu_read_unlock();
}
-static void audit_set_auditable(struct audit_context *ctx)
-{
- if (!ctx->prio) {
- ctx->prio = 1;
- ctx->current_state = AUDIT_RECORD_CONTEXT;
- }
-}
-
static inline struct audit_context *audit_get_context(struct task_struct *tsk,
int return_valid,
int return_code)
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists