From 3c7256fafcc08e8fd08fdca0f458c00485e1a32f Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 04:31:40 -0400
Subject: [PATCH] --- yaml --- r: 280272 b: refs/heads/master c:
 f69aac0006c303a98da9d2db04b71fd1c600d503 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 82ac3da2a156..c55d48f569a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 649fc7b1b046eb98bf9e3fe20c9d11f629293140
+refs/heads/master: f69aac0006c303a98da9d2db04b71fd1c600d503
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 85bb44f222c9..e275dc36d7c5 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2472,7 +2472,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
 	return error;
 }
 
-static int may_mknod(mode_t mode)
+static int may_mknod(umode_t mode)
 {
 	switch (mode & S_IFMT) {
 	case S_IFREG: