diff --git a/[refs] b/[refs] index a9f297a0a950..c9d65674f265 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c47da79851d5f8629c6715e681315dd8e0a3d7d8 +refs/heads/master: 030a8ba48fa6fa2a1304bab5b0f49360613c4af2 diff --git a/trunk/fs/autofs4/autofs_i.h b/trunk/fs/autofs4/autofs_i.h index 326dc08d3e3f..5869d4e974a9 100644 --- a/trunk/fs/autofs4/autofs_i.h +++ b/trunk/fs/autofs4/autofs_i.h @@ -155,7 +155,7 @@ static inline int autofs4_ispending(struct dentry *dentry) return 0; } -struct inode *autofs4_get_inode(struct super_block *, mode_t); +struct inode *autofs4_get_inode(struct super_block *, umode_t); void autofs4_free_ino(struct autofs_info *); /* Expiration */ diff --git a/trunk/fs/autofs4/inode.c b/trunk/fs/autofs4/inode.c index 8179f1ab8175..f799efad52a8 100644 --- a/trunk/fs/autofs4/inode.c +++ b/trunk/fs/autofs4/inode.c @@ -326,7 +326,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) return -EINVAL; } -struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode) +struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode) { struct inode *inode = new_inode(sb);