Merge branch 'upstream-fixes' into upstream

[linux-2.6] / fs / lockd / mon.c

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 5dd52b70859aa04f2ed2a7917b16204401fd8139..3fc683f46b3e1cd38df9e0da718fa1f4d46f3c8c 100644 (file)
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -233,8 +233,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
 };
 
@@ -247,7 +247,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
 };