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

Commit 89e9eabd authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: clean up xattr operation 



1. don't allocate redundant memory in read_all_xattrs.
2. introduce RESERVED_XATTR_SIZE for cleanup.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Reviewed-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 99f4b917

fs/f2fs/xattr.c

+11 −14
Original line number Diff line number Diff line
@@ -250,15 +250,13 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage, 
	void *cur_addr, *txattr_addr, *last_addr = NULL;

	nid_t xnid = F2FS_I(inode)->i_xattr_nid;

	unsigned int size = xnid ? VALID_XATTR_BLOCK_SIZE : 0;

	unsigned int inline_size = 0;

	unsigned int inline_size = inline_xattr_size(inode);

	int err = 0;



	inline_size = inline_xattr_size(inode);



	if (!size && !inline_size)

		return -ENODATA;



	txattr_addr = kzalloc(inline_size + size + sizeof(__u32),

	txattr_addr = kzalloc(inline_size + size + RESERVED_XATTR_SIZE,

							GFP_F2FS_ZERO);

	if (!txattr_addr)

		return -ENOMEM;
@@ -328,13 +326,14 @@ static int read_all_xattrs(struct inode *inode, struct page *ipage, 
{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct f2fs_xattr_header *header;

	size_t size = PAGE_SIZE, inline_size = 0;

	nid_t xnid = F2FS_I(inode)->i_xattr_nid;

	unsigned int size = VALID_XATTR_BLOCK_SIZE;

	unsigned int inline_size = inline_xattr_size(inode);

	void *txattr_addr;

	int err;



	inline_size = inline_xattr_size(inode);



	txattr_addr = kzalloc(inline_size + size, GFP_F2FS_ZERO);

	txattr_addr = kzalloc(inline_size + size + RESERVED_XATTR_SIZE,

							GFP_F2FS_ZERO);

	if (!txattr_addr)

		return -ENOMEM;
@@ -358,19 +357,19 @@ static int read_all_xattrs(struct inode *inode, struct page *ipage, 
	}



	/* read from xattr node block */

	if (F2FS_I(inode)->i_xattr_nid) {

	if (xnid) {

		struct page *xpage;

		void *xattr_addr;



		/* The inode already has an extended attribute block. */

		xpage = get_node_page(sbi, F2FS_I(inode)->i_xattr_nid);

		xpage = get_node_page(sbi, xnid);

		if (IS_ERR(xpage)) {

			err = PTR_ERR(xpage);

			goto fail;

		}



		xattr_addr = page_address(xpage);

		memcpy(txattr_addr + inline_size, xattr_addr, PAGE_SIZE);

		memcpy(txattr_addr + inline_size, xattr_addr, size);

		f2fs_put_page(xpage, 1);

	}
@@ -392,14 +391,12 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, 
				void *txattr_addr, struct page *ipage)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	size_t inline_size = 0;

	size_t inline_size = inline_xattr_size(inode);

	void *xattr_addr;

	struct page *xpage;

	nid_t new_nid = 0;

	int err;



	inline_size = inline_xattr_size(inode);



	if (hsize > inline_size && !F2FS_I(inode)->i_xattr_nid)

		if (!alloc_nid(sbi, &new_nid))

			return -ENOSPC;

fs/f2fs/xattr.h

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ struct f2fs_xattr_entry { 
				!IS_XATTR_LAST_ENTRY(entry);\

				entry = XATTR_NEXT_ENTRY(entry))

#define MAX_XATTR_BLOCK_SIZE	(PAGE_SIZE - sizeof(struct node_footer))

#define VALID_XATTR_BLOCK_SIZE	(MAX_XATTR_BLOCK_SIZE - sizeof(__u32))

#define RESERVED_XATTR_SIZE	(sizeof(__u32))

#define VALID_XATTR_BLOCK_SIZE	(MAX_XATTR_BLOCK_SIZE - RESERVED_XATTR_SIZE)

#define MIN_OFFSET(i)		XATTR_ALIGN(inline_xattr_size(i) +	\

						VALID_XATTR_BLOCK_SIZE)