From e24dbda7247b915c3a9290b7c56f70e7e8cbba15 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 29 Mar 2008 03:09:18 +0000
Subject: [PATCH] --- yaml --- r: 87931 b: refs/heads/master c:
 2b210adcb08c7966feeb8574cd90514f1e797ae9 h: refs/heads/master i:   87929:
 7cbbf25432fa34f418e9b48073f8e4a56f1354d8   87927:
 60893036a490fe71e7c64245458c17fd37b3a78c v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/cifsacl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f34872771b7e..cff68e370175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d61c4596d11d624efb4bbcbad01f9cf2b321162
+refs/heads/master: 2b210adcb08c7966feeb8574cd90514f1e797ae9
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c
index 1f5a4289b848..1cb5b0a9f2ac 100644
--- a/trunk/fs/cifs/cifsacl.c
+++ b/trunk/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));