staging: lustre: libcfs: remove != 0 testing (d95531fc) · Commits · 戴 / test

drivers/staging/lustre/lnet/libcfs/debug.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ libcfs_debug_mask2str(char *str, int size, int mask, int is_subsys)
		len++;
		}

		while (*token != 0) {
		while (*token) {
		if (len < size)
		str[len] = *token;
		token++;
		@@ -315,7 +315,7 @@ libcfs_debug_str2mask(int mask, const char str, int is_subsys)
		t = sscanf(str, "%i%n", &m, &matched);
		if (t >= 1 && matched == n) {
		/* don't print warning for lctl set_param debug=0 or -1 */
		if (m != 0 && m != -1)
		if (m && m != -1)
		CWARN("You are trying to use a numerical value for the mask - this will be deprecated in a future release.\n");
		*mask = m;
		return 0;

drivers/staging/lustre/lnet/libcfs/hash.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ cfs_hash_bd_get(struct cfs_hash hs, const void key, struct cfs_hash_bd *bd)
		cfs_hash_bd_from_key(hs, hs->hs_buckets,
		hs->hs_cur_bits, key, bd);
		} else {
		LASSERT(hs->hs_rehash_bits != 0);
		LASSERT(hs->hs_rehash_bits);
		cfs_hash_bd_from_key(hs, hs->hs_rehash_buckets,
		hs->hs_rehash_bits, key, bd);
		}
		@@ -629,7 +629,7 @@ cfs_hash_bd_lookup_intent(struct cfs_hash hs, struct cfs_hash_bd bd,
		struct hlist_head *hhead = cfs_hash_bd_hhead(hs, bd);
		struct hlist_node *ehnode;
		struct hlist_node *match;
		int intent_add = (intent & CFS_HS_LOOKUP_MASK_ADD) != 0;
		int intent_add = intent & CFS_HS_LOOKUP_MASK_ADD;

		/* with this function, we can avoid a lot of useless refcount ops,
		* which are expensive atomic operations most time.
		@@ -643,13 +643,13 @@ cfs_hash_bd_lookup_intent(struct cfs_hash hs, struct cfs_hash_bd bd,
		continue;

		/* match and ... */
		if ((intent & CFS_HS_LOOKUP_MASK_DEL) != 0) {
		if (intent & CFS_HS_LOOKUP_MASK_DEL) {
		cfs_hash_bd_del_locked(hs, bd, ehnode);
		return ehnode;
		}

		/* caller wants refcount? */
		if ((intent & CFS_HS_LOOKUP_MASK_REF) != 0)
		if (intent & CFS_HS_LOOKUP_MASK_REF)
		cfs_hash_get(hs, ehnode);
		return ehnode;
		}
		@@ -815,7 +815,7 @@ cfs_hash_dual_bd_get(struct cfs_hash hs, const void key,
		return;
		}

		LASSERT(hs->hs_rehash_bits != 0);
		LASSERT(hs->hs_rehash_bits);
		cfs_hash_bd_from_key(hs, hs->hs_rehash_buckets,
		hs->hs_rehash_bits, key, &bds[1]);

		@@ -976,7 +976,7 @@ static void cfs_hash_depth_wi_cancel(struct cfs_hash *hs)
		return;

		spin_lock(&hs->hs_dep_lock);
		while (hs->hs_dep_bits != 0) {
		while (hs->hs_dep_bits) {
		spin_unlock(&hs->hs_dep_lock);
		cond_resched();
		spin_lock(&hs->hs_dep_lock);
		@@ -1010,16 +1010,16 @@ cfs_hash_create(char *name, unsigned int cur_bits, unsigned int max_bits,
		LASSERT(ops->hs_get);
		LASSERT(ops->hs_put_locked);

		if ((flags & CFS_HASH_REHASH) != 0)
		if (flags & CFS_HASH_REHASH)
		flags \|= CFS_HASH_COUNTER; /* must have counter */

		LASSERT(cur_bits > 0);
		LASSERT(cur_bits >= bkt_bits);
		LASSERT(max_bits >= cur_bits && max_bits < 31);
		LASSERT(ergo((flags & CFS_HASH_REHASH) == 0, cur_bits == max_bits));
		LASSERT(ergo((flags & CFS_HASH_REHASH) != 0,
		LASSERT(ergo(flags & CFS_HASH_REHASH,
		(flags & CFS_HASH_NO_LOCK) == 0));
		LASSERT(ergo((flags & CFS_HASH_REHASH_KEY) != 0, ops->hs_keycpy));
		LASSERT(ergo(flags & CFS_HASH_REHASH_KEY, ops->hs_keycpy));

		len = (flags & CFS_HASH_BIGNAME) == 0 ?
		CFS_HASH_NAME_LEN : CFS_HASH_BIGNAME_LEN;
		@@ -1948,7 +1948,7 @@ out:
		/* can't refer to @hs anymore because it could be destroyed */
		if (bkts)
		cfs_hash_buckets_free(bkts, bsize, new_size, old_size);
		if (rc != 0)
		if (rc)
		CDEBUG(D_INFO, "early quit of rehashing: %d\n", rc);
		/* return 1 only if cfs_wi_exit is called */
		return rc == -ESRCH;
		@@ -2017,7 +2017,7 @@ cfs_hash_full_bkts(struct cfs_hash *hs)
		if (!hs->hs_rehash_buckets)
		return hs->hs_buckets;

		LASSERT(hs->hs_rehash_bits != 0);
		LASSERT(hs->hs_rehash_bits);
		return hs->hs_rehash_bits > hs->hs_cur_bits ?
		hs->hs_rehash_buckets : hs->hs_buckets;
		}
		@@ -2029,7 +2029,7 @@ cfs_hash_full_nbkt(struct cfs_hash *hs)
		if (!hs->hs_rehash_buckets)
		return CFS_HASH_NBKT(hs);

		LASSERT(hs->hs_rehash_bits != 0);
		LASSERT(hs->hs_rehash_bits);
		return hs->hs_rehash_bits > hs->hs_cur_bits ?
		CFS_HASH_RH_NBKT(hs) : CFS_HASH_NBKT(hs);
		}

drivers/staging/lustre/lnet/libcfs/libcfs_string.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -391,7 +391,7 @@ cfs_expr_list_print(char buffer, int count, struct cfs_expr_list expr_list)
		i += scnprintf(buffer + i, count - i, "[");

		list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
		if (j++ != 0)
		if (j++)
		i += scnprintf(buffer + i, count - i, ",");
		i += cfs_range_expr_print(buffer + i, count - i, expr,
		numexprs > 1);
		@@ -533,7 +533,7 @@ cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max,
		}

		rc = cfs_range_expr_parse(&tok, min, max, 1, &expr);
		if (rc != 0)
		if (rc)
		break;

		list_add_tail(&expr->re_link, &expr_list->el_exprs);
		@@ -544,7 +544,7 @@ cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max,
		list_add_tail(&expr->re_link, &expr_list->el_exprs);
		}

		if (rc != 0)
		if (rc)
		cfs_expr_list_free(expr_list);
		else
		*elpp = expr_list;

drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -712,7 +712,7 @@ cfs_cpt_num_estimate(void)
		*/
		ncpt = min(2U, ncpt);
		#endif
		while (ncpu % ncpt != 0)
		while (ncpu % ncpt)
		ncpt--; /* worst case is 1 */

		return ncpt;
		@@ -737,7 +737,7 @@ cfs_cpt_table_create(int ncpt)
		ncpt, rc);
		}

		if (num_online_cpus() % ncpt != 0) {
		if (num_online_cpus() % ncpt) {
		CERROR("CPU number %d is not multiple of cpu_npartition %d, please try different cpu_npartitions value or set pattern string by cpu_pattern=STRING\n",
		(int)num_online_cpus(), ncpt);
		goto failed;
		@@ -888,7 +888,7 @@ cfs_cpt_table_create_pattern(char *pattern)
		int n;

		if (!bracket) {
		if (*str != 0) {
		if (*str) {
		CERROR("Invalid pattern %s\n", str);
		goto failed;
		}
		@@ -911,7 +911,7 @@ cfs_cpt_table_create_pattern(char *pattern)
		goto failed;
		}

		if (cfs_cpt_weight(cptab, cpt) != 0) {
		if (cfs_cpt_weight(cptab, cpt)) {
		CERROR("Partition %d has already been set.\n", cpt);
		goto failed;
		}
		@@ -930,14 +930,14 @@ cfs_cpt_table_create_pattern(char *pattern)
		}

		if (cfs_expr_list_parse(str, (bracket - str) + 1,
		0, high, &el) != 0) {
		0, high, &el)) {
		CERROR("Can't parse number range: %s\n", str);
		goto failed;
		}

		list_for_each_entry(range, &el->el_exprs, re_link) {
		for (i = range->re_lo; i <= range->re_hi; i++) {
		if ((i - range->re_lo) % range->re_stride != 0)
		if ((i - range->re_lo) % range->re_stride)
		continue;

		rc = node ? cfs_cpt_set_node(cptab, cpt, i) :
		@@ -1044,7 +1044,7 @@ cfs_cpu_init(void)
		register_hotcpu_notifier(&cfs_cpu_notifier);
		#endif

		if (*cpu_pattern != 0) {
		if (*cpu_pattern) {
		cfs_cpt_table = cfs_cpt_table_create_pattern(cpu_pattern);
		if (!cfs_cpt_table) {
		CERROR("Failed to create cptab from pattern %s\n",

drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -93,12 +93,12 @@ static int cfs_crypto_hash_alloc(enum cfs_crypto_hash_alg hash_alg,

		if (key)
		err = crypto_ahash_setkey(tfm, key, key_len);
		else if ((*type)->cht_key != 0)
		else if ((*type)->cht_key)
		err = crypto_ahash_setkey(tfm,
		(unsigned char )&((type)->cht_key),
		(*type)->cht_size);

		if (err != 0) {
		if (err) {
		ahash_request_free(*req);
		crypto_free_ahash(tfm);
		return err;
		@@ -156,7 +156,7 @@ int cfs_crypto_hash_digest(enum cfs_crypto_hash_alg hash_alg,
		return -EINVAL;

		err = cfs_crypto_hash_alloc(hash_alg, &type, &req, key, key_len);
		if (err != 0)
		if (err)
		return err;

		if (!hash \|\| *hash_len < type->cht_size) {

Admin message