From 26a8fa1cabc1b5097ff79fc97611bde46172c0bd Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Tue, 17 Jan 2006 19:16:53 -0800
Subject: [PATCH] --- yaml --- r: 19006 b: refs/heads/master c:
 d41f084a74de860fe879403fbbad13abdf7aea8e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8f2c31ab6e12..70683c2705dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeac8047fcf4c659eb15f2e27a0ef4aeba64157f
+refs/heads/master: d41f084a74de860fe879403fbbad13abdf7aea8e
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 7a4e936d726c..217323b0c896 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -2542,7 +2542,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
 	if (rc) {
 		cFYI(1, ("Send error in QuerySecDesc = %d", rc));
 	} else {                /* decode response */
-		struct sec_desc * psec_desc;
+		struct cifs_sid * psec_desc;
 		__le32 * parm;
 		int parm_len;
 		int data_len;