Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / ocfs2-add-ocfs2_check_acl.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/ocfs2-add-ocfs2_check_acl.patch b/src/patches/suse-2.6.27.31/patches.suse/ocfs2-add-ocfs2_check_acl.patch
deleted file mode 100644 (file)
index 658bc20..0000000
--- a/src/patches/suse-2.6.27.31/patches.suse/ocfs2-add-ocfs2_check_acl.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Tiger Yang <tiger.yang@oracle.com>
-Date: Fri, 14 Nov 2008 11:17:18 +0800
-Subject: ocfs2: add ocfs2_check_acl
-Patch-mainline: 2.6.29
-
-This function is used to enhance permission checking with POSIX ACLs.
-
-Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
-Signed-off-by: Mark Fasheh <mfasheh@suse.com>
----
- fs/ocfs2/acl.c  |   15 +++++++++++++++
- fs/ocfs2/acl.h  |   10 ++++++++++
- fs/ocfs2/file.c |    3 ++-
- 3 files changed, 27 insertions(+), 1 deletions(-)
-
-diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
-index 62d0faa..a6a2bf6 100644
---- a/fs/ocfs2/acl.c
-+++ b/fs/ocfs2/acl.c
-@@ -230,6 +230,21 @@ static int ocfs2_set_acl(handle_t *handle,
-       return ret;
- }
- 
-+int ocfs2_check_acl(struct inode *inode, int mask)
-+{
-+      struct posix_acl *acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);
-+
-+      if (IS_ERR(acl))
-+              return PTR_ERR(acl);
-+      if (acl) {
-+              int ret = posix_acl_permission(inode, acl, mask);
-+              posix_acl_release(acl);
-+              return ret;
-+      }
-+
-+      return -EAGAIN;
-+}
-+
- static size_t ocfs2_xattr_list_acl_access(struct inode *inode,
-                                         char *list,
-                                         size_t list_len,
-diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h
-index 1b39f3e..fef10f1 100644
---- a/fs/ocfs2/acl.h
-+++ b/fs/ocfs2/acl.h
-@@ -26,4 +26,14 @@ struct ocfs2_acl_entry {
-       __le32 e_id;
- };
- 
-+#ifdef CONFIG_OCFS2_FS_POSIX_ACL
-+
-+extern int ocfs2_check_acl(struct inode *, int);
-+
-+#else /* CONFIG_OCFS2_FS_POSIX_ACL*/
-+
-+#define ocfs2_check_acl NULL
-+
-+#endif /* CONFIG_OCFS2_FS_POSIX_ACL*/
-+
- #endif /* OCFS2_ACL_H */
-diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
-index 3605491..7bad7d9 100644
---- a/fs/ocfs2/file.c
-+++ b/fs/ocfs2/file.c
-@@ -56,6 +56,7 @@
- #include "suballoc.h"
- #include "super.h"
- #include "xattr.h"
-+#include "acl.h"
- 
- #include "buffer_head_io.h"
- 
-@@ -1035,7 +1036,7 @@ int ocfs2_permission(struct inode *inode, int mask)
-               goto out;
-       }
- 
--      ret = generic_permission(inode, mask, NULL);
-+      ret = generic_permission(inode, mask, ocfs2_check_acl);
- 
-       ocfs2_inode_unlock(inode, 0);
- out:
--- 
-1.5.6
-