]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Mark Fasheh <mfasheh@suse.com> |
2 | Patch-mainline: 2.6.28 | |
3 | Subject: Remove un-defined acl handlers | |
4 | ||
5 | These handlers aren't actually defined yet. Having them around causes more | |
6 | trouble than it's worth. The ACL support patches will add them in a proper | |
7 | fashion. | |
8 | ||
9 | Signed-off-by: Mark Fasheh <mfasheh@suse.com> | |
10 | ||
11 | diff -pruN suse/trees/linux-2.6.27-ocfs2/fs/ocfs2//xattr.c linux-2.6.git/fs/ocfs2//xattr.c | |
12 | --- suse/trees/linux-2.6.27-ocfs2/fs/ocfs2/xattr.c 2009-02-05 15:46:43.000000000 -0800 | |
13 | +++ linux-2.6.git/fs/ocfs2/xattr.c 2009-02-05 15:51:33.000000000 -0800 | |
14 | @@ -79,29 +79,13 @@ static struct ocfs2_xattr_def_value_root | |
15 | ||
16 | struct xattr_handler *ocfs2_xattr_handlers[] = { | |
17 | &ocfs2_xattr_user_handler, | |
18 | -#ifdef CONFIG_OCFS2_FS_POSIX_ACL | |
19 | - &ocfs2_xattr_acl_access_handler, | |
20 | - &ocfs2_xattr_acl_default_handler, | |
21 | -#endif | |
22 | &ocfs2_xattr_trusted_handler, | |
23 | -#ifdef CONFIG_OCFS2_FS_SECURITY | |
24 | - &ocfs2_xattr_security_handler, | |
25 | -#endif | |
26 | NULL | |
27 | }; | |
28 | ||
29 | static struct xattr_handler *ocfs2_xattr_handler_map[] = { | |
30 | [OCFS2_XATTR_INDEX_USER] = &ocfs2_xattr_user_handler, | |
31 | -#ifdef CONFIG_OCFS2_FS_POSIX_ACL | |
32 | - [OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS] | |
33 | - = &ocfs2_xattr_acl_access_handler, | |
34 | - [OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT] | |
35 | - = &ocfs2_xattr_acl_default_handler, | |
36 | -#endif | |
37 | [OCFS2_XATTR_INDEX_TRUSTED] = &ocfs2_xattr_trusted_handler, | |
38 | -#ifdef CONFIG_OCFS2_FS_SECURITY | |
39 | - [OCFS2_XATTR_INDEX_SECURITY] = &ocfs2_xattr_security_handler, | |
40 | -#endif | |
41 | }; | |
42 | ||
43 | struct ocfs2_xattr_info { | |
44 | diff -pruN suse/trees/linux-2.6.27-ocfs2/fs/ocfs2//xattr.h linux-2.6.git/fs/ocfs2//xattr.h | |
45 | --- suse/trees/linux-2.6.27-ocfs2/fs/ocfs2/xattr.h 2009-02-05 15:46:43.000000000 -0800 | |
46 | +++ linux-2.6.git/fs/ocfs2/xattr.h 2009-02-05 15:51:33.000000000 -0800 | |
47 | @@ -40,13 +40,6 @@ enum ocfs2_xattr_type { | |
48 | ||
49 | extern struct xattr_handler ocfs2_xattr_user_handler; | |
50 | extern struct xattr_handler ocfs2_xattr_trusted_handler; | |
51 | -#ifdef CONFIG_OCFS2_FS_POSIX_ACL | |
52 | -extern struct xattr_handler ocfs2_xattr_acl_access_handler; | |
53 | -extern struct xattr_handler ocfs2_xattr_acl_default_handler; | |
54 | -#endif | |
55 | -#ifdef CONFIG_OCFS2_FS_SECURITY | |
56 | -extern struct xattr_handler ocfs2_xattr_security_handler; | |
57 | -#endif | |
58 | ||
59 | extern ssize_t ocfs2_listxattr(struct dentry *, char *, size_t); | |
60 | extern int ocfs2_xattr_get(struct inode *, int, const char *, void *, size_t); |