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. */