From 1d71fbb40172003120175c334c6087499b6870e0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 27 Jul 2011 14:04:25 -0400 Subject: [PATCH] --- yaml --- r: 280282 b: refs/heads/master c: 93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/auditsc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 23aa6ce2e0b9..64b6974d0001 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2570ebbd1f1ce1ef31f568b0660354fc59424be2 +refs/heads/master: 93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115 diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c index 7a074d65fff4..e7fe2b0d29b3 100644 --- a/trunk/kernel/auditsc.c +++ b/trunk/kernel/auditsc.c @@ -308,7 +308,7 @@ static int audit_match_perm(struct audit_context *ctx, int mask) static int audit_match_filetype(struct audit_context *ctx, int which) { unsigned index = which & ~S_IFMT; - mode_t mode = which & S_IFMT; + umode_t mode = which & S_IFMT; if (unlikely(!ctx)) return 0; @@ -1502,7 +1502,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts if (n->ino != (unsigned long)-1) { audit_log_format(ab, " inode=%lu" - " dev=%02x:%02x mode=%#o" + " dev=%02x:%02x mode=%#ho" " ouid=%u ogid=%u rdev=%02x:%02x", n->ino, MAJOR(n->dev),