Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[sfrench/cifs-2.6.git] / fs / jffs2 / acl.h

diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h
index b3421c78d9f85482be72d045fdde7194e2bb63d8..9b477246f2a6ec1c0e0f0b9a34c870f44e6ba734 100644 (file)
--- a/fs/jffs2/acl.h
+++ b/fs/jffs2/acl.h
@@ -28,7 +28,7 @@ struct jffs2_acl_header {
 
 struct posix_acl *jffs2_get_acl(struct inode *inode, int type);
 extern int jffs2_acl_chmod(struct inode *);
-extern int jffs2_init_acl_pre(struct inode *, struct inode *, mode_t *);
+extern int jffs2_init_acl_pre(struct inode *, struct inode *, umode_t *);
 extern int jffs2_init_acl_post(struct inode *);
 
 extern const struct xattr_handler jffs2_acl_access_xattr_handler;