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: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index aff7619e3f96e22f8788db39dca665e2c221ae10..528aed39981412d02e6cdff27ea8c9389fd73ebf 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -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;

diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
index d5a94928c11695cde054f6143cb604d0bf850fc0..1e7db8d0806e17b24f8979ac9a3a418b1fd15a41 100644 (file)
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
@@ -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)