projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
fs
/
nfsd
/
nfs4acl.c
diff --git
a/fs/nfsd/nfs4acl.c
b/fs/nfsd/nfs4acl.c
index
4a21055
..
7391f4a
100644
(file)
--- a/
fs/nfsd/nfs4acl.c
+++ b/
fs/nfsd/nfs4acl.c
@@
-907,7
+907,7
@@
nfs4_acl_get_whotype(char *p, u32 len)
{
int i;
{
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;
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;
{
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;
if (s2t_map[i].type == who) {
memcpy(p, s2t_map[i].string, s2t_map[i].stringlen);
return s2t_map[i].stringlen;