Просмотр исходного кода

f2fs: avoid potential unnecessary codes

This patch relocates some operations to avoid unnecessary execution.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Jaegeuk Kim 11 лет назад
Родитель
Сommit
3547ea961d
2 измененных файлов с 5 добавлено и 3 удалено
  1. 3 2
      fs/f2fs/data.c
  2. 2 1
      fs/f2fs/node.c

+ 3 - 2
fs/f2fs/data.c

@@ -299,8 +299,6 @@ void update_extent_cache(struct dnode_of_data *dn)
 	int need_update = true;
 	int need_update = true;
 
 
 	f2fs_bug_on(F2FS_I_SB(dn->inode), dn->data_blkaddr == NEW_ADDR);
 	f2fs_bug_on(F2FS_I_SB(dn->inode), dn->data_blkaddr == NEW_ADDR);
-	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
-							dn->ofs_in_node;
 
 
 	/* Update the page address in the parent node */
 	/* Update the page address in the parent node */
 	__set_data_blkaddr(dn);
 	__set_data_blkaddr(dn);
@@ -308,6 +306,9 @@ void update_extent_cache(struct dnode_of_data *dn)
 	if (is_inode_flag_set(fi, FI_NO_EXTENT))
 	if (is_inode_flag_set(fi, FI_NO_EXTENT))
 		return;
 		return;
 
 
+	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.ext_lock);
 
 
 	start_fofs = fi->ext.fofs;
 	start_fofs = fi->ext.fofs;

+ 2 - 1
fs/f2fs/node.c

@@ -348,7 +348,6 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)
 	struct nat_entry *e;
 	struct nat_entry *e;
 	int i;
 	int i;
 
 
-	memset(&ne, 0, sizeof(struct f2fs_nat_entry));
 	ni->nid = nid;
 	ni->nid = nid;
 
 
 	/* Check nat cache */
 	/* Check nat cache */
@@ -363,6 +362,8 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)
 	if (e)
 	if (e)
 		return;
 		return;
 
 
+	memset(&ne, 0, sizeof(struct f2fs_nat_entry));
+
 	/* Check current segment summary */
 	/* Check current segment summary */
 	mutex_lock(&curseg->curseg_mutex);
 	mutex_lock(&curseg->curseg_mutex);
 	i = lookup_journal_in_cursum(sum, NAT_JOURNAL, nid, 0);
 	i = lookup_journal_in_cursum(sum, NAT_JOURNAL, nid, 0);