Skip to content

Commit

Permalink
[XFS] Remove CONFIG_XFS_SECURITY.
Browse files Browse the repository at this point in the history
There is no point to the CONFIG_XFS_SECURITY option; it disables the
ability to set security attributes at runtime, but it does not actually
slim down or remove any code for runtime. Just remove it and always allow
security attributes to be set.

SGI-PV: 980310
SGI-Modid: xfs-linux-melb:xfs-kern:30877a

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
  • Loading branch information
Eric Sandeen authored and Lachlan McIlroy committed Apr 18, 2008
1 parent 6d1337b commit f7d3c34
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 28 deletions.
12 changes: 0 additions & 12 deletions fs/xfs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,6 @@ config XFS_QUOTA
with or without the generic quota support enabled (CONFIG_QUOTA) -
they are completely independent subsystems.

config XFS_SECURITY
bool "XFS Security Label support"
depends on XFS_FS
help
Security labels support alternative access control models
implemented by security modules like SELinux. This option
enables an extended attribute namespace for inode security
labels in the XFS filesystem.

If you are not using a security module that requires using
extended attributes for inode security labels, say N.

config XFS_POSIX_ACL
bool "XFS POSIX ACL support"
depends on XFS_FS
Expand Down
8 changes: 1 addition & 7 deletions fs/xfs/linux-2.6/xfs_super.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,7 @@ extern void xfs_qm_exit(void);
# define set_posix_acl_flag(sb) do { } while (0)
#endif

#ifdef CONFIG_XFS_SECURITY
# define XFS_SECURITY_STRING "security attributes, "
# define ENOSECURITY 0
#else
# define XFS_SECURITY_STRING
# define ENOSECURITY EOPNOTSUPP
#endif
#define XFS_SECURITY_STRING "security attributes, "

#ifdef CONFIG_XFS_RT
# define XFS_REALTIME_STRING "realtime, "
Expand Down
10 changes: 1 addition & 9 deletions fs/xfs/xfs_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -2646,14 +2646,6 @@ attr_trusted_capable(
return 0;
}

STATIC int
attr_secure_capable(
bhv_vnode_t *vp,
cred_t *cred)
{
return -ENOSECURITY;
}

STATIC int
attr_system_set(
bhv_vnode_t *vp, char *name, void *data, size_t size, int xflags)
Expand Down Expand Up @@ -2724,7 +2716,7 @@ struct attrnames attr_secure = {
.attr_get = attr_generic_get,
.attr_set = attr_generic_set,
.attr_remove = attr_generic_remove,
.attr_capable = attr_secure_capable,
.attr_capable = (attrcapable_t)fs_noerr,
};

struct attrnames attr_user = {
Expand Down

0 comments on commit f7d3c34

Please sign in to comment.