[PATCH] fs: Use ARRAY_SIZE macro

Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a
duplicate of ARRAY_SIZE.  Some trailing whitespaces are also deleted.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: David Howells <dhowells@redhat.com>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Chris Mason <mason@suse.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Nathan Scott <nathans@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 5 insertions, 5 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 0edc03e67966..a89cb8aa2c88 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -224,8 +224,8 @@ static struct rpc_procinfo	nsm_procedures[] = {
 };
 
 static struct rpc_version       nsm_version1 = {
-                .number         = 1, 
-                .nrprocs        = sizeof(nsm_procedures)/sizeof(nsm_procedures[0]),
+                .number         = 1,
+                .nrprocs        = ARRAY_SIZE(nsm_procedures),
                 .procs          = nsm_procedures
 };
 
@@ -238,7 +238,7 @@ static struct rpc_stat		nsm_stats;
 static struct rpc_program       nsm_program = {
                 .name           = "statd",
                 .number         = SM_PROGRAM,
-                .nrvers         = sizeof(nsm_version)/sizeof(nsm_version[0]),
+                .nrvers         = ARRAY_SIZE(nsm_version),
                 .version        = nsm_version,
                 .stats          = &nsm_stats
 };
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 71a30b416d1a..5e85bde6c123 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -509,7 +509,7 @@ static struct svc_version *	nlmsvc_version[] = {
 
 static struct svc_stat          nlmsvc_stats;
 
-#define NLM_NRVERS      (sizeof(nlmsvc_version)/sizeof(nlmsvc_version[0]))
+#define NLM_NRVERS      ARRAY_SIZE(nlmsvc_version)
 static struct svc_program       nlmsvc_program = {
         .pg_prog                = NLM_PROGRAM,          /* program number */
         .pg_nvers               = NLM_NRVERS,           /* number of entries in nlmsvc_version */
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 200fbda2c6d1..1d700a4dd0b5 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -599,7 +599,7 @@ static struct rpc_stat		nlm_stats;
 struct rpc_program              nlm_program = {
                 .name           = "lockd",
                 .number         = NLM_PROGRAM,
-                .nrvers         = sizeof(nlm_versions) / sizeof(nlm_versions[0]),
+                .nrvers         = ARRAY_SIZE(nlm_versions),
                 .version        = nlm_versions,
                 .stats          = &nlm_stats,
 };