staging: lustre: llite: remove code never called

We have if (1) conditionals which is pointless so remove
it and the next code block is never called so remove that
as well.

Signed-off-by: wang di <di.wang@intel.com>
Reviewed-on: http://review.whamcloud.com/7043
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3531
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 907fae4f19906dd35ba50267b5c2f2d223f70359..2307e70dea2c26133cb9422e95fab587689e6f35 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -576,7 +576,7 @@ int ll_dir_read(struct inode *inode, struct md_op_data *op_data,
                         */
                        done = 1;
                        ll_release_page(page, 0);
-               } else if (1 /* chain is exhausted*/) {
+               } else {
                        /*
                         * Normal case: continue to the next
                         * page.
@@ -587,13 +587,6 @@ int ll_dir_read(struct inode *inode, struct md_op_data *op_data,
                        next = pos;
                        page = ll_get_dir_page(inode, pos,
                                               &chain);
-               } else {
-                       /*
-                        * go into overflow page.
-                        */
-                       LASSERT(le32_to_cpu(dp->ldp_flags) &
-                               LDF_COLLIDE);
-                       ll_release_page(page, 1);
                }
        }
 

diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c
index b1994a7dfb49b75737a439e573353676fd723eed..df51f145ad5d3220839c5a0c2b9e2de49dda18c2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@ -1224,7 +1224,7 @@ do_it:
 
                        rc = 0;
                        goto out;
-               } else if (1) {
+               } else {
                        /*
                         * chain is exhausted.
                         * Normal case: continue to the next page.
@@ -1232,12 +1232,6 @@ do_it:
                        ll_release_page(page, le32_to_cpu(dp->ldp_flags) &
                                              LDF_COLLIDE);
                        page = ll_get_dir_page(dir, pos, &chain);
-               } else {
-                       LASSERT(le32_to_cpu(dp->ldp_flags) & LDF_COLLIDE);
-                       ll_release_page(page, 1);
-                       /*
-                        * go into overflow page.
-                        */
                }
        }
 
@@ -1434,8 +1428,8 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                         * End of directory reached.
                         */
                        ll_release_page(page, 0);
-                       break;
-               } else if (1) {
+                       goto out;
+               } else {
                        /*
                         * chain is exhausted
                         * Normal case: continue to the next page.
@@ -1443,12 +1437,6 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                        ll_release_page(page, le32_to_cpu(dp->ldp_flags) &
                                              LDF_COLLIDE);
                        page = ll_get_dir_page(dir, pos, &chain);
-               } else {
-                       /*
-                        * go into overflow page.
-                        */
-                       LASSERT(le32_to_cpu(dp->ldp_flags) & LDF_COLLIDE);
-                       ll_release_page(page, 1);
                }
        }