From 91a241ba2947f41e8116a43b35b6cc53c2721df6 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 24 Jul 2011 23:20:18 -0400
Subject: [PATCH] --- yaml --- r: 280263 b: refs/heads/master c:
 62bb109170375f82eb3c51c8080b72954f02dca7 h: refs/heads/master i:   280261:
 2ec0723c1609500033fced435e3fd991982ae0e4   280259:
 2e59b56d5a60165dbd313282816b3438f4375200   280255:
 3a6cde21084aaefd57960a22b60480cc00e8cf32 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/inode.c         | 2 +-
 trunk/include/linux/fs.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1bcf4b567fe3..c0c511accb91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 175a4eb7ea531cdbf6d574f5d5ba9aa0f5e8ed13
+refs/heads/master: 62bb109170375f82eb3c51c8080b72954f02dca7
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index 24d02907e196..961355d00e38 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -1646,7 +1646,7 @@ EXPORT_SYMBOL(init_special_inode);
  * @mode: mode of the new inode
  */
 void inode_init_owner(struct inode *inode, const struct inode *dir,
-			mode_t mode)
+			umode_t mode)
 {
 	inode->i_uid = current_fsuid();
 	if (dir && dir->i_mode & S_ISGID) {
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index b89eef1d1752..9db9f6e6c98b 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1534,7 +1534,7 @@ extern void dentry_unhash(struct dentry *dentry);
  * VFS file helper functions.
  */
 extern void inode_init_owner(struct inode *inode, const struct inode *dir,
-			mode_t mode);
+			umode_t mode);
 /*
  * VFS FS_IOC_FIEMAP helper definitions.
  */