2.6.24

 fs

 cifs

diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index 5eff35d..93a7c34 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/cifsacl.h
  *
- *   Copyright (c) International Business Machines  Corp., 2005
+ *   Copyright (c) International Business Machines  Corp., 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -22,17 +22,62 @@
 #ifndef _CIFSACL_H
 #define _CIFSACL_H
 
+
+#define NUM_AUTHS 6 /* number of authority fields */
+#define NUM_SUBAUTHS 5 /* number of sub authority fields */
+#define NUM_WK_SIDS 7 /* number of well known sids */
+#define SIDNAMELENGTH 20 /* long enough for the ones we care about */
+
+#define READ_BIT        0x4
+#define WRITE_BIT       0x2
+#define EXEC_BIT        0x1
+
+#define UBITSHIFT   6
+#define GBITSHIFT   3
+
+#define ACCESS_ALLOWED   0
+#define ACCESS_DENIED   1
+
+struct cifs_ntsd {
+   __le16 revision; /* revision level */
+   __le16 type;
+   __le32 osidoffset;
+   __le32 gsidoffset;
+   __le32 sacloffset;
+   __le32 dacloffset;
+} __attribute__((packed));
+
 struct cifs_sid {
    __u8 revision; /* revision level */
-   __u8 num_subauths;
+   __u8 num_subauth;
    __u8 authority[6];
-   __u32 sub_auth[4];
-   /* next sub_auth if any ... */
+   __le32 sub_auth[5]; /* sub_auth[num_subauth] */
 } __attribute__((packed));
 
-/* everyone */
-/* extern const struct cifs_sid sid_everyone;*/
-/* group users */
-/* extern const struct cifs_sid sid_user;*/
+struct cifs_acl {
+   __le16 revision; /* revision level */
+   __le16 size;
+   __le32 num_aces;
+} __attribute__((packed));
+
+struct cifs_ace {
+   __u8 type;
+   __u8 flags;
+   __le16 size;
+   __le32 access_req;
+   struct cifs_sid sid; /* ie UUID of user or group who gets these perms */
+} __attribute__((packed));
+
+struct cifs_wksid {
+   struct cifs_sid cifssid;
+   char sidname[SIDNAMELENGTH];
+} __attribute__((packed));
+
+#ifdef CONFIG_CIFS_EXPERIMENTAL
+
+extern int match_sid(struct cifs_sid *);
+extern int compare_sids(const struct cifs_sid *, const struct cifs_sid *);
+
+#endif /*  CONFIG_CIFS_EXPERIMENTAL */
 
 #endif /* _CIFSACL_H */