]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: lustre: llite: rename some variables for ll_dir_read
authorwang di <di.wang@intel.com>
Fri, 22 Jul 2016 02:44:07 +0000 (22:44 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Aug 2016 16:31:06 +0000 (18:31 +0200)
The variables api32 and hash64 was renamed to is_api32 and
is_hash64.

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>
drivers/staging/lustre/lustre/llite/dir.c

index 70a3ca020a7dd0caf075551bd8d79c752e7e6454..907fae4f19906dd35ba50267b5c2f2d223f70359 100644 (file)
@@ -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