Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26f5c084 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

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: default avatarwang 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: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f48c52c

drivers/staging/lustre/lustre/llite/dir.c

+1 −8
Original line number Diff line number Diff line
@@ -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);

		}

	}

drivers/staging/lustre/lustre/llite/statahead.c

+3 −15
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int ll_statahead_thread(void *arg) 


			rc = 0;

			goto out;

		} else if (1) {

		} else {

			/*

			 * chain is exhausted.

			 * Normal case: continue to the next page.
@@ -1232,12 +1232,6 @@ static int ll_statahead_thread(void *arg) 
			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);

		}

	}