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

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

staging: lustre: llite: rename some variables for ll_dir_read 



The variables api32 and hash64 was renamed to is_api32 and
is_hash64.

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 13810b0f

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

+4 −4
Original line number Diff line number Diff line
@@ -494,8 +494,8 @@ int ll_dir_read(struct inode *inode, struct md_op_data *op_data, 
{

	struct ll_sb_info    *sbi	= ll_i2sbi(inode);

	__u64		   pos		= ctx->pos;

	int		   api32      = ll_need_32bit_api(sbi);

	int		   hash64     = sbi->ll_flags & LL_SBI_64BIT_HASH;

	int		   is_api32 = ll_need_32bit_api(sbi);

	int		   is_hash64 = sbi->ll_flags & LL_SBI_64BIT_HASH;

	struct page	  *page;

	struct ll_dir_chain   chain;

	bool		   done = false;
@@ -545,12 +545,12 @@ int ll_dir_read(struct inode *inode, struct md_op_data *op_data, 
				 */

				continue;



			if (api32 && hash64)

			if (is_api32 && is_hash64)

				lhash = hash >> 32;

			else

				lhash = hash;

			fid_le_to_cpu(&fid, &ent->lde_fid);

			ino = cl_fid_build_ino(&fid, api32);

			ino = cl_fid_build_ino(&fid, is_api32);

			type = ll_dirent_type_get(ent);

			ctx->pos = lhash;

			/* For 'll_nfs_get_name_filldir()', it will try