summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 21:07:44 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 21:07:44 (GMT)
commitd24c2af42292cb4ad9c829d71fe0d795112ca6e7 (patch)
treeb34387b4949737f5c69f5c1f395c015385fe9d60 /fs
parenta0c3061093c8b49facef95dc09a618c6e0d17cb5 (diff)
parent4f61258f6111e2afd56cf40989e5a43cba9e59c8 (diff)
downloadlinux-d24c2af42292cb4ad9c829d71fe0d795112ca6e7.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required)
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/cifsacl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 5f02b4e..8f17006 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -38,7 +38,7 @@ static const struct cifs_sid sid_everyone = {
1, 1, {0, 0, 0, 0, 0, 1}, {0} };
/* security id for Authenticated Users system group */
static const struct cifs_sid sid_authusers = {
- 1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(11)} };
+ 1, 1, {0, 0, 0, 0, 0, 5}, {__constant_cpu_to_le32(11)} };
/* group users */
static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };