ocfs2: clean up dead code in alloc.c
authorChangwei Ge <ge.changwei@h3c.com>
Thu, 1 Feb 2018 00:14:55 +0000 (16:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Feb 2018 01:18:35 +0000 (17:18 -0800)
Some stack variables are no longer used but still assigned.  Trim them.

Link: http://lkml.kernel.org/r/1516105069-12643-1-git-send-email-ge.changwei@h3c.com
Signed-off-by: Changwei Ge <ge.changwei@h3c.com>
Reviewed-by: Jun Piao <piaojun@huawei.com>
Reviewed-by: Alex Chen <alex.chen@huawei.com>
Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/alloc.c

index ab5105f9767edde5aaf5892c272907e8288afc85..134f3b5c25b013e3c8e49c0a528d641ea510b935 100644 (file)
@@ -2598,11 +2598,8 @@ static void ocfs2_unlink_subtree(handle_t *handle,
        int i;
        struct buffer_head *root_bh = left_path->p_node[subtree_index].bh;
        struct ocfs2_extent_list *root_el = left_path->p_node[subtree_index].el;
-       struct ocfs2_extent_list *el;
        struct ocfs2_extent_block *eb;
 
-       el = path_leaf_el(left_path);
-
        eb = (struct ocfs2_extent_block *)right_path->p_node[subtree_index + 1].bh->b_data;
 
        for(i = 1; i < le16_to_cpu(root_el->l_next_free_rec); i++)
@@ -3938,7 +3935,7 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle,
                                           struct ocfs2_path *path,
                                           struct ocfs2_extent_rec *insert_rec)
 {
-       int ret, i, next_free;
+       int i, next_free;
        struct buffer_head *bh;
        struct ocfs2_extent_list *el;
        struct ocfs2_extent_rec *rec;
@@ -3955,7 +3952,6 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle,
                        ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
                                    "Owner %llu has a bad extent list\n",
                                    (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
-                       ret = -EIO;
                        return;
                }
 
@@ -5057,7 +5053,6 @@ int ocfs2_split_extent(handle_t *handle,
        struct buffer_head *last_eb_bh = NULL;
        struct ocfs2_extent_rec *rec = &el->l_recs[split_index];
        struct ocfs2_merge_ctxt ctxt;
-       struct ocfs2_extent_list *rightmost_el;
 
        if (le32_to_cpu(rec->e_cpos) > le32_to_cpu(split_rec->e_cpos) ||
            ((le32_to_cpu(rec->e_cpos) + le16_to_cpu(rec->e_leaf_clusters)) <
@@ -5093,9 +5088,7 @@ int ocfs2_split_extent(handle_t *handle,
                }
 
                eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;
-               rightmost_el = &eb->h_list;
-       } else
-               rightmost_el = path_root_el(path);
+       }
 
        if (rec->e_cpos == split_rec->e_cpos &&
            rec->e_leaf_clusters == split_rec->e_leaf_clusters)