2014-07-02 10:54:27

by Anil Belur

Subject: [PATCH v2 1/1] staging: lustre: libcfs: nidstrings.c - use ARRAY_SIZE macro

From: Anil Belur <[email protected]>

- this patch replaces sizeof(a)/sizeof(a[0]) with the ARRAY_SIZE macro
to get the number of nidstrings (and netstrfns)
- v2: also for netstrfns

Signed-off-by: Anil Belur <[email protected]>
---
drivers/staging/lustre/lustre/libcfs/nidstrings.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/nidstrings.c b/drivers/staging/lustre/lustre/libcfs/nidstrings.c
index 87705ae..4fc7b45 100644
--- a/drivers/staging/lustre/lustre/libcfs/nidstrings.c
+++ b/drivers/staging/lustre/lustre/libcfs/nidstrings.c
@@ -74,8 +74,7 @@ libcfs_next_nidstring(void)
spin_lock_irqsave(&libcfs_nidstring_lock, flags);

str = libcfs_nidstrings[libcfs_nidstring_idx++];
- if (libcfs_nidstring_idx ==
- sizeof(libcfs_nidstrings)/sizeof(libcfs_nidstrings[0]))
+ if (libcfs_nidstring_idx == ARRAY_SIZE(libcfs_nidstrings))
libcfs_nidstring_idx = 0;

spin_unlock_irqrestore(&libcfs_nidstring_lock, flags);
@@ -198,7 +197,7 @@ static struct netstrfns libcfs_netstrfns[] = {
{/* .nf_type */ -1},
};

-const int libcfs_nnetstrfns = sizeof(libcfs_netstrfns)/sizeof(libcfs_netstrfns[0]);
+const int libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);

int
libcfs_lo_str2addr(const char *str, int nob, __u32 *addr)
--
1.9.1

2014-07-08 23:44:03

by Greg Kroah-Hartman

Subject: Re: [PATCH v2 1/1] staging: lustre: libcfs: nidstrings.c - use ARRAY_SIZE macro

On Wed, Jul 02, 2014 at 04:23:55PM +0530, Anil Belur wrote:
> From: Anil Belur <[email protected]>
>
> - this patch replaces sizeof(a)/sizeof(a[0]) with the ARRAY_SIZE macro
> to get the number of nidstrings (and netstrfns)
> - v2: also for netstrfns
>
> Signed-off-by: Anil Belur <[email protected]>

Someone sent this same patch just before you did, sorry :(

2014-07-09 04:25:31

by Anil Belur

Subject: Re: [PATCH v2 1/1] staging: lustre: libcfs: nidstrings.c - use ARRAY_SIZE macro

On Wednesday 09 July 2014 05:18 AM, Greg KH wrote:
> Someone sent this same patch just before you did, sorry :(
>
Ah - no worries - sorry for the noise.