From 11746270adc740371a2411410376a4bd4d27ccb9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 23 Jul 2011 19:01:48 -0400 Subject: [PATCH] --- yaml --- r: 262073 b: refs/heads/master c: 3a5fba19b080b365d67866db38e32e6a4a2089e8 h: refs/heads/master i: 262071: cfb7cf5aacc67f1dacd0adfc9c4eda9b6d572718 v: v3 --- [refs] | 2 +- trunk/fs/posix_acl.c | 2 +- trunk/include/linux/posix_acl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5970f6eab872..cae6f1ae3392 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6952123b53cc8b334df69bba2cd0063b0d88f68 +refs/heads/master: 3a5fba19b080b365d67866db38e32e6a4a2089e8 diff --git a/trunk/fs/posix_acl.c b/trunk/fs/posix_acl.c index 3d943be6761c..4e16e8001982 100644 --- a/trunk/fs/posix_acl.c +++ b/trunk/fs/posix_acl.c @@ -188,7 +188,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p) * Create an ACL representing the file mode permission bits of an inode. */ struct posix_acl * -posix_acl_from_mode(mode_t mode, gfp_t flags) +posix_acl_from_mode(umode_t mode, gfp_t flags) { struct posix_acl *acl = posix_acl_alloc(3, flags); if (!acl) diff --git a/trunk/include/linux/posix_acl.h b/trunk/include/linux/posix_acl.h index 529c32ad58c0..16ecfb485d28 100644 --- a/trunk/include/linux/posix_acl.h +++ b/trunk/include/linux/posix_acl.h @@ -75,7 +75,7 @@ extern void posix_acl_init(struct posix_acl *, int); extern struct posix_acl *posix_acl_alloc(int, gfp_t); extern int posix_acl_valid(const struct posix_acl *); extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); -extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t); +extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t); extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *); extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *); extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);