f2fs: move ext_lock out of struct extent_info

Move ext_lock out of struct extent_info, then in the following patches we can
use variables with struct extent_info type as a parameter to pass pure data.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 985ed023a750170b924455ea23e2684c50baeba4..0811d6509fcee4e15393736f5816a8490e9426aa 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -258,9 +258,9 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,
        if (is_inode_flag_set(fi, FI_NO_EXTENT))
                return 0;
 
-       read_lock(&fi->ext.ext_lock);
+       read_lock(&fi->ext_lock);
        if (fi->ext.len == 0) {
-               read_unlock(&fi->ext.ext_lock);
+               read_unlock(&fi->ext_lock);
                return 0;
        }
 
@@ -284,10 +284,10 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,
                        bh_result->b_size = UINT_MAX;
 
                stat_inc_read_hit(inode->i_sb);
-               read_unlock(&fi->ext.ext_lock);
+               read_unlock(&fi->ext_lock);
                return 1;
        }
-       read_unlock(&fi->ext.ext_lock);
+       read_unlock(&fi->ext_lock);
        return 0;
 }
 
@@ -309,7 +309,7 @@ void update_extent_cache(struct dnode_of_data *dn)
        fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
                                                        dn->ofs_in_node;
 
-       write_lock(&fi->ext.ext_lock);
+       write_lock(&fi->ext_lock);
 
        start_fofs = fi->ext.fofs;
        end_fofs = fi->ext.fofs + fi->ext.len - 1;
@@ -366,7 +366,7 @@ void update_extent_cache(struct dnode_of_data *dn)
                need_update = true;
        }
 end_update:
-       write_unlock(&fi->ext.ext_lock);
+       write_unlock(&fi->ext_lock);
        if (need_update)
                sync_inode_page(dn);
        return;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f8da399eb7112698a12dc613a2174b9afc784943..c3caa3cb5beb00d715692ff7927938beaf1248a6 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -277,7 +277,6 @@ enum {
 #define F2FS_MIN_EXTENT_LEN    16      /* minimum extent length */
 
 struct extent_info {
-       rwlock_t ext_lock;      /* rwlock for consistency */
        unsigned int fofs;      /* start offset in a file */
        u32 blk_addr;           /* start block address of the extent */
        unsigned int len;       /* length of the extent */
@@ -309,6 +308,7 @@ struct f2fs_inode_info {
        nid_t i_xattr_nid;              /* node id that contains xattrs */
        unsigned long long xattr_ver;   /* cp version of xattr modification */
        struct extent_info ext;         /* in-memory extent cache entry */
+       rwlock_t ext_lock;              /* rwlock for single extent cache */
        struct inode_entry *dirty_dir;  /* the pointer of dirty dir */
 
        struct radix_tree_root inmem_root;      /* radix tree for inmem pages */
@@ -319,21 +319,17 @@ struct f2fs_inode_info {
 static inline void get_extent_info(struct extent_info *ext,
                                        struct f2fs_extent i_ext)
 {
-       write_lock(&ext->ext_lock);
        ext->fofs = le32_to_cpu(i_ext.fofs);
        ext->blk_addr = le32_to_cpu(i_ext.blk_addr);
        ext->len = le32_to_cpu(i_ext.len);
-       write_unlock(&ext->ext_lock);
 }
 
 static inline void set_raw_extent(struct extent_info *ext,
                                        struct f2fs_extent *i_ext)
 {
-       read_lock(&ext->ext_lock);
        i_ext->fofs = cpu_to_le32(ext->fofs);
        i_ext->blk_addr = cpu_to_le32(ext->blk_addr);
        i_ext->len = cpu_to_le32(ext->len);
-       read_unlock(&ext->ext_lock);
 }
 
 struct f2fs_nm_info {

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 2d002e3738a77be52be0f5b810b577e62f017192..28dd26a502769e77ab0a5022cb6351db80bd0d6b 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -130,7 +130,10 @@ static int do_read_inode(struct inode *inode)
        fi->i_pino = le32_to_cpu(ri->i_pino);
        fi->i_dir_level = ri->i_dir_level;
 
+       write_lock(&fi->ext_lock);
        get_extent_info(&fi->ext, ri->i_ext);
+       write_unlock(&fi->ext_lock);
+
        get_inline_info(fi, ri);
 
        /* check data exist */
@@ -220,7 +223,11 @@ void update_inode(struct inode *inode, struct page *node_page)
        ri->i_links = cpu_to_le32(inode->i_nlink);
        ri->i_size = cpu_to_le64(i_size_read(inode));
        ri->i_blocks = cpu_to_le64(inode->i_blocks);
+
+       read_lock(&F2FS_I(inode)->ext_lock);
        set_raw_extent(&F2FS_I(inode)->ext, &ri->i_ext);
+       read_unlock(&F2FS_I(inode)->ext_lock);
+
        set_raw_inline(F2FS_I(inode), ri);
 
        ri->i_atime = cpu_to_le64(inode->i_atime.tv_sec);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f2fe666a6ea995a29d5aee3f228acaf75e6cf85a..4e9aad451593bc09f7bebfb11208a4a54b584538 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -392,7 +392,7 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
        atomic_set(&fi->dirty_pages, 0);
        fi->i_current_depth = 1;
        fi->i_advise = 0;
-       rwlock_init(&fi->ext.ext_lock);
+       rwlock_init(&fi->ext_lock);
        init_rwsem(&fi->i_sem);
        INIT_RADIX_TREE(&fi->inmem_root, GFP_NOFS);
        INIT_LIST_HEAD(&fi->inmem_pages);