From 3a86012f06a166daebe3848ed8f9287635a2a2c9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 04:31:05 -0400
Subject: [PATCH] --- yaml --- r: 280271 b: refs/heads/master c:
 649fc7b1b046eb98bf9e3fe20c9d11f629293140 h: refs/heads/master i:   280269:
 864681a2eb1fd3db95aec82e0644a375a6a9186a   280267:
 0d04a5cf2e0fc68814783b4f8560881c279dcbcc   280263:
 91a241ba2947f41e8116a43b35b6cc53c2721df6   280255:
 3a6cde21084aaefd57960a22b60480cc00e8cf32 v: v3

---
 [refs]             | 2 +-
 trunk/mm/filemap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab19e845e24d..82ac3da2a156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ef0c042bf06f6aef382fade175075627beebc1
+refs/heads/master: 649fc7b1b046eb98bf9e3fe20c9d11f629293140
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 5f0a3c91fdac..a0701e6eec10 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1968,7 +1968,7 @@ EXPORT_SYMBOL(read_cache_page);
  */
 int should_remove_suid(struct dentry *dentry)
 {
-	mode_t mode = dentry->d_inode->i_mode;
+	umode_t mode = dentry->d_inode->i_mode;
 	int kill = 0;
 
 	/* suid always must be killed */