---

yaml --- r: 280263 b: refs/heads/master c: 62bb109 h: refs/heads/master i: 280261: 2ec0723 280259: 2e59b56 280255: 3a6cde2 v: v3
git-mirror · Jan 4, 2012 · 91a241b · 91a241b
1 parent 3a9c8d7
commit 91a241b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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.
  */