提交 2b50638d 编写于 作者: J Jaegeuk Kim

f2fs: clean up unused variables and return values

This patch cleans up a couple of unnecessary codes related to unused variables
and return values.
Signed-off-by: NJaegeuk Kim <jaegeuk.kim@samsung.com>
上级 ce19a5d4
...@@ -390,9 +390,7 @@ static int gc_node_segment(struct f2fs_sb_info *sbi, ...@@ -390,9 +390,7 @@ static int gc_node_segment(struct f2fs_sb_info *sbi,
} }
err = check_valid_map(sbi, segno, off); err = check_valid_map(sbi, segno, off);
if (err == GC_ERROR) if (err == GC_NEXT)
return err;
else if (err == GC_NEXT)
continue; continue;
if (initial) { if (initial) {
...@@ -550,9 +548,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, ...@@ -550,9 +548,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
} }
err = check_valid_map(sbi, segno, off); err = check_valid_map(sbi, segno, off);
if (err == GC_ERROR) if (err == GC_NEXT)
goto stop;
else if (err == GC_NEXT)
continue; continue;
if (phase == 0) { if (phase == 0) {
...@@ -562,9 +558,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, ...@@ -562,9 +558,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
/* Get an inode by ino with checking validity */ /* Get an inode by ino with checking validity */
err = check_dnode(sbi, entry, &dni, start_addr + off, &nofs); err = check_dnode(sbi, entry, &dni, start_addr + off, &nofs);
if (err == GC_ERROR) if (err == GC_NEXT)
goto stop;
else if (err == GC_NEXT)
continue; continue;
if (phase == 1) { if (phase == 1) {
......
...@@ -71,7 +71,7 @@ static void str2hashbuf(const char *msg, int len, unsigned int *buf, int num) ...@@ -71,7 +71,7 @@ static void str2hashbuf(const char *msg, int len, unsigned int *buf, int num)
f2fs_hash_t f2fs_dentry_hash(const char *name, int len) f2fs_hash_t f2fs_dentry_hash(const char *name, int len)
{ {
__u32 hash, minor_hash; __u32 hash;
f2fs_hash_t f2fs_hash; f2fs_hash_t f2fs_hash;
const char *p; const char *p;
__u32 in[8], buf[4]; __u32 in[8], buf[4];
...@@ -94,8 +94,6 @@ f2fs_hash_t f2fs_dentry_hash(const char *name, int len) ...@@ -94,8 +94,6 @@ f2fs_hash_t f2fs_dentry_hash(const char *name, int len)
p += 16; p += 16;
} }
hash = buf[0]; hash = buf[0];
minor_hash = buf[1];
f2fs_hash = cpu_to_le32(hash & ~F2FS_HASH_COL_BIT); f2fs_hash = cpu_to_le32(hash & ~F2FS_HASH_COL_BIT);
return f2fs_hash; return f2fs_hash;
} }
...@@ -1088,7 +1088,6 @@ static int f2fs_write_node_page(struct page *page, ...@@ -1088,7 +1088,6 @@ static int f2fs_write_node_page(struct page *page,
{ {
struct f2fs_sb_info *sbi = F2FS_SB(page->mapping->host->i_sb); struct f2fs_sb_info *sbi = F2FS_SB(page->mapping->host->i_sb);
nid_t nid; nid_t nid;
unsigned int nofs;
block_t new_addr; block_t new_addr;
struct node_info ni; struct node_info ni;
...@@ -1105,7 +1104,6 @@ static int f2fs_write_node_page(struct page *page, ...@@ -1105,7 +1104,6 @@ static int f2fs_write_node_page(struct page *page,
/* get old block addr of this node page */ /* get old block addr of this node page */
nid = nid_of_node(page); nid = nid_of_node(page);
nofs = ofs_of_node(page);
BUG_ON(page->index != nid); BUG_ON(page->index != nid);
get_node_info(sbi, nid, &ni); get_node_info(sbi, nid, &ni);
...@@ -1566,7 +1564,7 @@ void flush_nat_entries(struct f2fs_sb_info *sbi) ...@@ -1566,7 +1564,7 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
nid_t nid; nid_t nid;
struct f2fs_nat_entry raw_ne; struct f2fs_nat_entry raw_ne;
int offset = -1; int offset = -1;
block_t old_blkaddr, new_blkaddr; block_t new_blkaddr;
ne = list_entry(cur, struct nat_entry, list); ne = list_entry(cur, struct nat_entry, list);
nid = nat_get_nid(ne); nid = nat_get_nid(ne);
...@@ -1580,7 +1578,6 @@ void flush_nat_entries(struct f2fs_sb_info *sbi) ...@@ -1580,7 +1578,6 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
offset = lookup_journal_in_cursum(sum, NAT_JOURNAL, nid, 1); offset = lookup_journal_in_cursum(sum, NAT_JOURNAL, nid, 1);
if (offset >= 0) { if (offset >= 0) {
raw_ne = nat_in_journal(sum, offset); raw_ne = nat_in_journal(sum, offset);
old_blkaddr = le32_to_cpu(raw_ne.block_addr);
goto flush_now; goto flush_now;
} }
to_nat_page: to_nat_page:
...@@ -1602,7 +1599,6 @@ void flush_nat_entries(struct f2fs_sb_info *sbi) ...@@ -1602,7 +1599,6 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
BUG_ON(!nat_blk); BUG_ON(!nat_blk);
raw_ne = nat_blk->entries[nid - start_nid]; raw_ne = nat_blk->entries[nid - start_nid];
old_blkaddr = le32_to_cpu(raw_ne.block_addr);
flush_now: flush_now:
new_blkaddr = nat_get_blkaddr(ne); new_blkaddr = nat_get_blkaddr(ne);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册