Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a59f452 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] remove <linux/xattr_acl.h> 



This file duplicates <linux/posix_acl_xattr.h>, using slightly different
names.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9fd27a2

arch/ppc/boot/simple/misc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -222,7 +222,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum) 
	puts("\n");

	puts("\n");





	puts("Uncompressing Linux...");

	puts("Uncompressing Linux...");

	gunzip(0x0, 0x400000, zimage_start, &zimage_size);

	gunzip(NULL, 0x400000, zimage_start, &zimage_size);

	puts("done.\n");

	puts("done.\n");





	/* get the bi_rec address */

	/* get the bi_rec address */

arch/ppc/boot/simple/mpc10x_memory.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 




#define MPC10X_PCI_OP(rw, size, type, op, mask)			 	\

#define MPC10X_PCI_OP(rw, size, type, op, mask)			 	\

static void								\

static void								\

mpc10x_##rw##_config_##size(unsigned int *cfg_addr, 			\

mpc10x_##rw##_config_##size(unsigned int __iomem *cfg_addr, 			\

		unsigned int *cfg_data, int devfn, int offset,		\

		unsigned int *cfg_data, int devfn, int offset,		\

		type val)						\

		type val)						\

{									\

{									\

fs/ext2/acl.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -396,12 +396,12 @@ static size_t 
ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size,

ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size,

			   const char *name, size_t name_len)

			   const char *name, size_t name_len)

{

{

	const size_t size = sizeof(XATTR_NAME_ACL_ACCESS);

	const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);





	if (!test_opt(inode->i_sb, POSIX_ACL))

	if (!test_opt(inode->i_sb, POSIX_ACL))

		return 0;

		return 0;

	if (list && size <= list_size)

	if (list && size <= list_size)

		memcpy(list, XATTR_NAME_ACL_ACCESS, size);

		memcpy(list, POSIX_ACL_XATTR_ACCESS, size);

	return size;

	return size;

}

}
@@ -409,12 +409,12 @@ static size_t 
ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size,

ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size,

			    const char *name, size_t name_len)

			    const char *name, size_t name_len)

{

{

	const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT);

	const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);





	if (!test_opt(inode->i_sb, POSIX_ACL))

	if (!test_opt(inode->i_sb, POSIX_ACL))

		return 0;

		return 0;

	if (list && size <= list_size)

	if (list && size <= list_size)

		memcpy(list, XATTR_NAME_ACL_DEFAULT, size);

		memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);

	return size;

	return size;

}

}
@@ -506,14 +506,14 @@ ext2_xattr_set_acl_default(struct inode *inode, const char *name, 
}

}





struct xattr_handler ext2_xattr_acl_access_handler = {

struct xattr_handler ext2_xattr_acl_access_handler = {

	.prefix	= XATTR_NAME_ACL_ACCESS,

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.list	= ext2_xattr_list_acl_access,

	.list	= ext2_xattr_list_acl_access,

	.get	= ext2_xattr_get_acl_access,

	.get	= ext2_xattr_get_acl_access,

	.set	= ext2_xattr_set_acl_access,

	.set	= ext2_xattr_set_acl_access,

};

};





struct xattr_handler ext2_xattr_acl_default_handler = {

struct xattr_handler ext2_xattr_acl_default_handler = {

	.prefix	= XATTR_NAME_ACL_DEFAULT,

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.list	= ext2_xattr_list_acl_default,

	.list	= ext2_xattr_list_acl_default,

	.get	= ext2_xattr_get_acl_default,

	.get	= ext2_xattr_get_acl_default,

	.set	= ext2_xattr_set_acl_default,

	.set	= ext2_xattr_set_acl_default,

fs/ext2/acl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
  (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>

  (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>

*/

*/





#include <linux/xattr_acl.h>

#include <linux/posix_acl_xattr.h>





#define EXT2_ACL_VERSION	0x0001

#define EXT2_ACL_VERSION	0x0001

fs/ext3/acl.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -417,12 +417,12 @@ static size_t 
ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len,

ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len,

			   const char *name, size_t name_len)

			   const char *name, size_t name_len)

{

{

	const size_t size = sizeof(XATTR_NAME_ACL_ACCESS);

	const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);





	if (!test_opt(inode->i_sb, POSIX_ACL))

	if (!test_opt(inode->i_sb, POSIX_ACL))

		return 0;

		return 0;

	if (list && size <= list_len)

	if (list && size <= list_len)

		memcpy(list, XATTR_NAME_ACL_ACCESS, size);

		memcpy(list, POSIX_ACL_XATTR_ACCESS, size);

	return size;

	return size;

}

}
@@ -430,12 +430,12 @@ static size_t 
ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len,

ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len,

			    const char *name, size_t name_len)

			    const char *name, size_t name_len)

{

{

	const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT);

	const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);





	if (!test_opt(inode->i_sb, POSIX_ACL))

	if (!test_opt(inode->i_sb, POSIX_ACL))

		return 0;

		return 0;

	if (list && size <= list_len)

	if (list && size <= list_len)

		memcpy(list, XATTR_NAME_ACL_DEFAULT, size);

		memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);

	return size;

	return size;

}

}
@@ -535,14 +535,14 @@ ext3_xattr_set_acl_default(struct inode *inode, const char *name, 
}

}





struct xattr_handler ext3_xattr_acl_access_handler = {

struct xattr_handler ext3_xattr_acl_access_handler = {

	.prefix	= XATTR_NAME_ACL_ACCESS,

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.list	= ext3_xattr_list_acl_access,

	.list	= ext3_xattr_list_acl_access,

	.get	= ext3_xattr_get_acl_access,

	.get	= ext3_xattr_get_acl_access,

	.set	= ext3_xattr_set_acl_access,

	.set	= ext3_xattr_set_acl_access,

};

};





struct xattr_handler ext3_xattr_acl_default_handler = {

struct xattr_handler ext3_xattr_acl_default_handler = {

	.prefix	= XATTR_NAME_ACL_DEFAULT,

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.list	= ext3_xattr_list_acl_default,

	.list	= ext3_xattr_list_acl_default,

	.get	= ext3_xattr_get_acl_default,

	.get	= ext3_xattr_get_acl_default,

	.set	= ext3_xattr_set_acl_default,

	.set	= ext3_xattr_set_acl_default,