From c0a2b1d2125ff7c4679e1ef64b2b0cd94d64be4c Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Tue, 25 Sep 2007 19:53:44 +0000
Subject: [PATCH] --- yaml --- r: 71560 b: refs/heads/master c:
 65874007c36930317c7a56d814a6a3e2966daaa8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9bf2246ad419..4862ee5fa7d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcb020341a7d0fba6cd025f068d40f4ab5c36af8
+refs/heads/master: 65874007c36930317c7a56d814a6a3e2966daaa8
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c
index 11ac13336ecb..90969104dd39 100644
--- a/trunk/fs/cifs/cifsacl.c
+++ b/trunk/fs/cifs/cifsacl.c
@@ -21,6 +21,13 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <linux/fs.h>
+#include "cifspdu.h"
+#include "cifsglob.h"
+#include "cifsproto.h"
+#include "cifs_debug.h"
+#include "cifsacl.h"
+
 /* security id for everyone */
 static const struct cifs_sid sid_everyone =
 		{1, 1, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0}};
@@ -51,7 +58,7 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl)
 /* Convert CIFS ACL to POSIX form */
 int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len)
 {
-	int i;
+	int i, rc;
 	int num_aces = 0;
 	int acl_size;
 	struct cifs_sid *owner_sid_ptr, *group_sid_ptr;