aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-07-31 03:37:52 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:38 -0400
commit0a725fc4d3bfc4734164863d6c50208b109ca5c7 (patch)
treed0b8c618a5af484b88c08dc04643fa05e1bcf144
parent749997e5127a1df6b68a10c686af3f5b819a41a2 (diff)
nfsd4: idmap upcalls should use unsigned uid and gid
We shouldn't be using negative uid's and gid's in the idmap upcalls. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/nfsd/nfs4idmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 2cf9a9a2d89c..2ccffde81b84 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -138,7 +138,7 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
138 char idstr[11]; 138 char idstr[11];
139 139
140 qword_add(bpp, blen, ent->authname); 140 qword_add(bpp, blen, ent->authname);
141 snprintf(idstr, sizeof(idstr), "%d", ent->id); 141 snprintf(idstr, sizeof(idstr), "%u", ent->id);
142 qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user"); 142 qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
143 qword_add(bpp, blen, idstr); 143 qword_add(bpp, blen, idstr);
144 144
@@ -165,7 +165,7 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
165 return 0; 165 return 0;
166 } 166 }
167 ent = container_of(h, struct ent, h); 167 ent = container_of(h, struct ent, h);
168 seq_printf(m, "%s %s %d", ent->authname, 168 seq_printf(m, "%s %s %u", ent->authname,
169 ent->type == IDMAP_TYPE_GROUP ? "group" : "user", 169 ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
170 ent->id); 170 ent->id);
171 if (test_bit(CACHE_VALID, &h->flags)) 171 if (test_bit(CACHE_VALID, &h->flags))
@@ -349,7 +349,7 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
349 ent->type == IDMAP_TYPE_GROUP ? "group" : "user", 349 ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
350 ent->name); 350 ent->name);
351 if (test_bit(CACHE_VALID, &h->flags)) 351 if (test_bit(CACHE_VALID, &h->flags))
352 seq_printf(m, " %d", ent->id); 352 seq_printf(m, " %u", ent->id);
353 seq_printf(m, "\n"); 353 seq_printf(m, "\n");
354 return 0; 354 return 0;
355} 355}