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

f2fs: clean up __find_inline_xattr() with __find_xattr() 



Just cleanup, no logic change.

Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 645a3c40

fs/f2fs/xattr.c

+11 −18
Original line number Diff line number Diff line
@@ -226,15 +226,18 @@ static inline const struct xattr_handler *f2fs_xattr_handler(int index) 
}



static struct f2fs_xattr_entry *__find_xattr(void *base_addr,

				void *last_base_addr, int index,

				size_t len, const char *name)

				void *last_base_addr, void **last_addr,

				int index, size_t len, const char *name)

{

	struct f2fs_xattr_entry *entry;



	list_for_each_xattr(entry, base_addr) {

		if ((void *)(entry) + sizeof(__u32) > last_base_addr ||

			(void *)XATTR_NEXT_ENTRY(entry) > last_base_addr)

			(void *)XATTR_NEXT_ENTRY(entry) > last_base_addr) {

			if (last_addr)

				*last_addr = entry;

			return NULL;

		}



		if (entry->e_name_index != index)

			continue;
@@ -254,19 +257,9 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode, 
	unsigned int inline_size = inline_xattr_size(inode);

	void *max_addr = base_addr + inline_size;



	list_for_each_xattr(entry, base_addr) {

		if ((void *)entry + sizeof(__u32) > max_addr ||

			(void *)XATTR_NEXT_ENTRY(entry) > max_addr) {

			*last_addr = entry;

	entry = __find_xattr(base_addr, max_addr, last_addr, index, len, name);

	if (!entry)

		return NULL;

		}

		if (entry->e_name_index != index)

			continue;

		if (entry->e_name_len != len)

			continue;

		if (!memcmp(entry->e_name, name, len))

			break;

	}



	/* inline xattr header or entry across max inline xattr size */

	if (IS_XATTR_LAST_ENTRY(entry) &&
@@ -368,7 +361,7 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage, 
	else

		cur_addr = txattr_addr;



	*xe = __find_xattr(cur_addr, last_txattr_addr, index, len, name);

	*xe = __find_xattr(cur_addr, last_txattr_addr, NULL, index, len, name);

	if (!*xe) {

		f2fs_err(F2FS_I_SB(inode), "inode (%lu) has corrupted xattr",

								inode->i_ino);
@@ -659,7 +652,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, 
	last_base_addr = (void *)base_addr + XATTR_SIZE(inode);



	/* find entry with wanted name. */

	here = __find_xattr(base_addr, last_base_addr, index, len, name);

	here = __find_xattr(base_addr, last_base_addr, NULL, index, len, name);

	if (!here) {

		f2fs_err(F2FS_I_SB(inode), "inode (%lu) has corrupted xattr",

								inode->i_ino);