Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs: introduce raw_nat_from_node_info() to simplfy codes

Browse Source 
This patch introduce raw_nat_from_node_info() to simplfy some codes, and also
use exist function node_info_from_raw_nat() to do the same job.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Chao Yu 2014-04-17 10:51:05 +08:00 committed by Jaegeuk Kim
parent 876dc59eb1
commit 94dac22e72
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/f2fs/node.c
View File

@ -179,9 +179,7 @@ static void cache_nat_entry(struct f2fs_nm_info *nm_i, nid_t nid,
write_unlock(&nm_i->nat_tree_lock);
goto retry;
}
nat_set_blkaddr(e, le32_to_cpu(ne->block_addr));
nat_set_ino(e, le32_to_cpu(ne->ino));
nat_set_version(e, ne->version);
node_info_from_raw_nat(&e->ni, ne);
}
write_unlock(&nm_i->nat_tree_lock);
}
@ -1755,9 +1753,7 @@ static bool flush_nats_in_journal(struct f2fs_sb_info *sbi)
write_unlock(&nm_i->nat_tree_lock);
goto retry;
}
nat_set_blkaddr(ne, le32_to_cpu(raw_ne.block_addr));
nat_set_ino(ne, le32_to_cpu(raw_ne.ino));
nat_set_version(ne, raw_ne.version);
node_info_from_raw_nat(&ne->ni, &raw_ne);
__set_nat_cache_dirty(nm_i, ne);
write_unlock(&nm_i->nat_tree_lock);
}
@ -1790,7 +1786,6 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
nid_t nid;
struct f2fs_nat_entry raw_ne;
int offset = -1;
block_t new_blkaddr;
if (nat_get_blkaddr(ne) == NEW_ADDR)
continue;
@ -1826,11 +1821,7 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
f2fs_bug_on(!nat_blk);
raw_ne = nat_blk->entries[nid - start_nid];
flush_now:
new_blkaddr = nat_get_blkaddr(ne);
raw_ne.ino = cpu_to_le32(nat_get_ino(ne));
raw_ne.block_addr = cpu_to_le32(new_blkaddr);
raw_ne.version = nat_get_version(ne);
raw_nat_from_node_info(&raw_ne, &ne->ni);
if (offset < 0) {
nat_blk->entries[nid - start_nid] = raw_ne;

8
fs/f2fs/node.h
View File

@ -75,6 +75,14 @@ static inline void node_info_from_raw_nat(struct node_info *ni,
ni->version = raw_ne->version;
}
static inline void raw_nat_from_node_info(struct f2fs_nat_entry *raw_ne,
struct node_info *ni)
{
raw_ne->ino = cpu_to_le32(ni->ino);
raw_ne->block_addr = cpu_to_le32(ni->blk_addr);
raw_ne->version = ni->version;
}
enum nid_type {
FREE_NIDS, /* indicates the free nid list */
NAT_ENTRIES /* indicates the cached nat entry */