Commit d24c2af4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents a0c30610 4f61258f

fs/cifs/cifsacl.c

+1 −1
Original line number Diff line number Diff line
@@ -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}, {} };