From 65a243b810003f0a077287ae9515272a4874e104 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 26 Aug 2011 23:03:17 -0400
Subject: [PATCH] --- yaml --- r: 280284 b: refs/heads/master c:
 d179333f37d33533f4c77118f757b9e7835ccb7c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/security/tomoyo/audit.c  | 4 ++--
 trunk/security/tomoyo/common.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 89fcd3b7c1b7..38e49f0a5479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84dfa9897ef913771af44484fefbe0de29fdce51
+refs/heads/master: d179333f37d33533f4c77118f757b9e7835ccb7c
diff --git a/trunk/security/tomoyo/audit.c b/trunk/security/tomoyo/audit.c
index 075c3a6d1649..5ca47ea3049f 100644
--- a/trunk/security/tomoyo/audit.c
+++ b/trunk/security/tomoyo/audit.c
@@ -112,7 +112,7 @@ static char *tomoyo_print_bprm(struct linux_binprm *bprm,
  *
  * Returns file type string.
  */
-static inline const char *tomoyo_filetype(const mode_t mode)
+static inline const char *tomoyo_filetype(const umode_t mode)
 {
 	switch (mode & S_IFMT) {
 	case S_IFREG:
@@ -180,7 +180,7 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r)
 	for (i = 0; i < TOMOYO_MAX_PATH_STAT; i++) {
 		struct tomoyo_mini_stat *stat;
 		unsigned int dev;
-		mode_t mode;
+		umode_t mode;
 		if (!obj->stat_valid[i])
 			continue;
 		stat = &obj->stat[i];
diff --git a/trunk/security/tomoyo/common.h b/trunk/security/tomoyo/common.h
index ed311d7a8ce0..deeab7be5b97 100644
--- a/trunk/security/tomoyo/common.h
+++ b/trunk/security/tomoyo/common.h
@@ -564,7 +564,7 @@ struct tomoyo_mini_stat {
 	uid_t uid;
 	gid_t gid;
 	ino_t ino;
-	mode_t mode;
+	umode_t mode;
 	dev_t dev;
 	dev_t rdev;
 };