Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 82 insertions, 0 deletions

diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
new file mode 100644
index 000000000000..fed96ae81a7d
--- /dev/null
+++ b/fs/ext2/acl.h
@@ -0,0 +1,82 @@
+/*
+  File: fs/ext2/acl.h
+
+  (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
+*/
+
+#include <linux/xattr_acl.h>
+
+#define EXT2_ACL_VERSION        0x0001
+
+typedef struct {
+        __le16          e_tag;
+        __le16          e_perm;
+        __le32          e_id;
+} ext2_acl_entry;
+
+typedef struct {
+        __le16          e_tag;
+        __le16          e_perm;
+} ext2_acl_entry_short;
+
+typedef struct {
+        __le32          a_version;
+} ext2_acl_header;
+
+static inline size_t ext2_acl_size(int count)
+{
+        if (count <= 4) {
+                return sizeof(ext2_acl_header) +
+                       count * sizeof(ext2_acl_entry_short);
+        } else {
+                return sizeof(ext2_acl_header) +
+                       4 * sizeof(ext2_acl_entry_short) +
+                       (count - 4) * sizeof(ext2_acl_entry);
+        }
+}
+
+static inline int ext2_acl_count(size_t size)
+{
+        ssize_t s;
+        size -= sizeof(ext2_acl_header);
+        s = size - 4 * sizeof(ext2_acl_entry_short);
+        if (s < 0) {
+                if (size % sizeof(ext2_acl_entry_short))
+                        return -1;
+                return size / sizeof(ext2_acl_entry_short);
+        } else {
+                if (s % sizeof(ext2_acl_entry))
+                        return -1;
+                return s / sizeof(ext2_acl_entry) + 4;
+        }
+}
+
+#ifdef CONFIG_EXT2_FS_POSIX_ACL
+
+/* Value for inode->u.ext2_i.i_acl and inode->u.ext2_i.i_default_acl
+   if the ACL has not been cached */
+#define EXT2_ACL_NOT_CACHED ((void *)-1)
+
+/* acl.c */
+extern int ext2_permission (struct inode *, int, struct nameidata *);
+extern int ext2_acl_chmod (struct inode *);
+extern int ext2_init_acl (struct inode *, struct inode *);
+
+#else
+#include <linux/sched.h>
+#define ext2_permission NULL
+#define ext2_get_acl    NULL
+#define ext2_set_acl    NULL
+
+static inline int
+ext2_acl_chmod (struct inode *inode)
+{
+        return 0;
+}
+
+static inline int ext2_init_acl (struct inode *inode, struct inode *dir)
+{
+        return 0;
+}
+#endif
+