Unverified Commit d549b741 authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: rename generic posix acl handlers 



Reflect in their naming and document that they are kept around for
legacy reasons and shouldn't be used anymore by new code.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent 387b96a5

fs/erofs/xattr.h

+2 −4
Original line number Diff line number Diff line
@@ -49,10 +49,8 @@ static inline const char *erofs_xattr_prefix(unsigned int idx, 
	static const struct xattr_handler *xattr_handler_map[] = {

		[EROFS_XATTR_INDEX_USER] = &erofs_xattr_user_handler,

#ifdef CONFIG_EROFS_FS_POSIX_ACL

		[EROFS_XATTR_INDEX_POSIX_ACL_ACCESS] =

			&posix_acl_access_xattr_handler,

		[EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT] =

			&posix_acl_default_xattr_handler,

		[EROFS_XATTR_INDEX_POSIX_ACL_ACCESS] = &nop_posix_acl_access,

		[EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT] = &nop_posix_acl_default,

#endif

		[EROFS_XATTR_INDEX_TRUSTED] = &erofs_xattr_trusted_handler,

#ifdef CONFIG_EROFS_FS_SECURITY

fs/ext2/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *, 
static const struct xattr_handler *ext2_xattr_handler_map[] = {

	[EXT2_XATTR_INDEX_USER]		     = &ext2_xattr_user_handler,

#ifdef CONFIG_EXT2_FS_POSIX_ACL

	[EXT2_XATTR_INDEX_POSIX_ACL_ACCESS]  = &posix_acl_access_xattr_handler,

	[EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,

	[EXT2_XATTR_INDEX_POSIX_ACL_ACCESS]  = &nop_posix_acl_access,

	[EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &nop_posix_acl_default,

#endif

	[EXT2_XATTR_INDEX_TRUSTED]	     = &ext2_xattr_trusted_handler,

#ifdef CONFIG_EXT2_FS_SECURITY

fs/ext4/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *); 
static const struct xattr_handler * const ext4_xattr_handler_map[] = {

	[EXT4_XATTR_INDEX_USER]		     = &ext4_xattr_user_handler,

#ifdef CONFIG_EXT4_FS_POSIX_ACL

	[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS]  = &posix_acl_access_xattr_handler,

	[EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,

	[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS]  = &nop_posix_acl_access,

	[EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT] = &nop_posix_acl_default,

#endif

	[EXT4_XATTR_INDEX_TRUSTED]	     = &ext4_xattr_trusted_handler,

#ifdef CONFIG_EXT4_FS_SECURITY

fs/f2fs/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ const struct xattr_handler f2fs_xattr_security_handler = { 
static const struct xattr_handler *f2fs_xattr_handler_map[] = {

	[F2FS_XATTR_INDEX_USER] = &f2fs_xattr_user_handler,

#ifdef CONFIG_F2FS_FS_POSIX_ACL

	[F2FS_XATTR_INDEX_POSIX_ACL_ACCESS] = &posix_acl_access_xattr_handler,

	[F2FS_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,

	[F2FS_XATTR_INDEX_POSIX_ACL_ACCESS] = &nop_posix_acl_access,

	[F2FS_XATTR_INDEX_POSIX_ACL_DEFAULT] = &nop_posix_acl_default,

#endif

	[F2FS_XATTR_INDEX_TRUSTED] = &f2fs_xattr_trusted_handler,

#ifdef CONFIG_F2FS_FS_SECURITY

fs/jffs2/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -939,10 +939,10 @@ static const char *jffs2_xattr_prefix(int xprefix, struct dentry *dentry) 
#endif

#ifdef CONFIG_JFFS2_FS_POSIX_ACL

	case JFFS2_XPREFIX_ACL_ACCESS:

		ret = &posix_acl_access_xattr_handler;

		ret = &nop_posix_acl_access;

		break;

	case JFFS2_XPREFIX_ACL_DEFAULT:

		ret = &posix_acl_default_xattr_handler;

		ret = &nop_posix_acl_default;

		break;

#endif

	case JFFS2_XPREFIX_TRUSTED: