From 08d6ccf39bfb752fdef465f73e6fc7417259af31 Mon Sep 17 00:00:00 2001 From: Arushi Singhal Date: Wed, 22 Mar 2017 21:23:33 +0530 Subject: [PATCH] staging: lustre: Replace a bit shift by a use of BIT. This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle: @@ constant c; @@ -1 << c +BIT(c) Signed-off-by: Arushi Singhal Reviewed-by: Andreas Dilger Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 8 ++++---- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c index eaa4399..3ed3b08 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c @@ -1906,14 +1906,14 @@ ksocknal_connect(struct ksock_route *route) if (retry_later) /* needs reschedule */ break; - if (wanted & (1 << SOCKLND_CONN_ANY)) { + if (wanted & BIT(SOCKLND_CONN_ANY)) { type = SOCKLND_CONN_ANY; - } else if (wanted & (1 << SOCKLND_CONN_CONTROL)) { + } else if (wanted & BIT(SOCKLND_CONN_CONTROL)) { type = SOCKLND_CONN_CONTROL; - } else if (wanted & (1 << SOCKLND_CONN_BULK_IN)) { + } else if (wanted & BIT(SOCKLND_CONN_BULK_IN)) { type = SOCKLND_CONN_BULK_IN; } else { - LASSERT(wanted & (1 << SOCKLND_CONN_BULK_OUT)); + LASSERT(wanted & BIT(SOCKLND_CONN_BULK_OUT)); type = SOCKLND_CONN_BULK_OUT; } diff --git a/drivers/staging/lustre/lnet/lnet/lib-ptl.c b/drivers/staging/lustre/lnet/lnet/lib-ptl.c index 63cce0c..3333272 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-ptl.c +++ b/drivers/staging/lustre/lnet/lnet/lib-ptl.c @@ -334,7 +334,7 @@ lnet_mt_test_exhausted(struct lnet_match_table *mtable, int pos) bmap = &mtable->mt_exhausted[pos >> LNET_MT_BITS_U64]; pos &= (1 << LNET_MT_BITS_U64) - 1; - return (*bmap & (1ULL << pos)); + return (*bmap & BIT(pos)); } static void diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c index 40f1fcf..c742cba 100644 --- a/drivers/staging/lustre/lustre/llite/lproc_llite.c +++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c @@ -1308,7 +1308,7 @@ static void ll_display_extents_info(struct ll_rw_extents_info *io_extents, r, pct(r, read_tot), pct(read_cum, read_tot), w, pct(w, write_tot), pct(write_cum, write_tot)); start = end; - if (start == 1 << 10) { + if (start == 1024) { start = 1; units += 10; unitp++; -- 2.7.4