diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /fs/cifs/cifsacl.c | |
| parent | [POWERPC] Remove CONFIG_PCI_LEGACY from some configs (diff) | |
| parent | Linux 2.6.25-rc9 (diff) | |
| download | linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.xz linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'fs/cifs/cifsacl.c')
| -rw-r--r-- | fs/cifs/cifsacl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 1f5a4289b848..1cb5b0a9f2ac 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -261,7 +261,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use, return; } -static __le16 fill_ace_for_sid(struct cifs_ace *pntace, +static __u16 fill_ace_for_sid(struct cifs_ace *pntace, const struct cifs_sid *psid, __u64 nmode, umode_t bits) { int i; @@ -411,7 +411,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid, struct cifs_sid *pgrpsid, __u64 nmode) { - __le16 size = 0; + u16 size = 0; struct cifs_acl *pnndacl; pnndacl = (struct cifs_acl *)((char *)pndacl + sizeof(struct cifs_acl)); |