Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 4a2105552ac4..7391f4aabedb 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -907,7 +907,7 @@ nfs4_acl_get_whotype(char *p, u32 len)
 {
         int i;
 
-        for (i=0; i < sizeof(s2t_map) / sizeof(*s2t_map); i++) {
+        for (i = 0; i < ARRAY_SIZE(s2t_map); i++) {
                 if (s2t_map[i].stringlen == len &&
                                 0 == memcmp(s2t_map[i].string, p, len))
                         return s2t_map[i].type;
@@ -920,7 +920,7 @@ nfs4_acl_write_who(int who, char *p)
 {
         int i;
 
-        for (i=0; i < sizeof(s2t_map) / sizeof(*s2t_map); i++) {
+        for (i = 0; i < ARRAY_SIZE(s2t_map); i++) {
                 if (s2t_map[i].type == who) {
                         memcpy(p, s2t_map[i].string, s2t_map[i].stringlen);
                         return s2t_map[i].stringlen;