X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fafs%2Fvlocation.c;h=849fc3160cb5b372c2626545f926ce185c22762b;hb=7343b3b3a627eb30e24e921f004f659c8ebb91c5;hp=6c8e95a7c2c94f0372d4bf3ac0255f41878650a1;hpb=98b96173c777c67daaa7d163a35e591e1928a164;p=linux-2.6-omap-h63xx.git diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c index 6c8e95a7c2c..849fc3160cb 100644 --- a/fs/afs/vlocation.c +++ b/fs/afs/vlocation.c @@ -12,10 +12,11 @@ #include #include #include +#include #include "internal.h" -unsigned afs_vlocation_timeout = 10; /* volume location timeout in seconds */ -unsigned afs_vlocation_update_timeout = 10 * 60; +static unsigned afs_vlocation_timeout = 10; /* volume location timeout in seconds */ +static unsigned afs_vlocation_update_timeout = 10 * 60; static void afs_vlocation_reaper(struct work_struct *); static void afs_vlocation_updater(struct work_struct *); @@ -334,7 +335,7 @@ static int afs_vlocation_fill_in_record(struct afs_vlocation *vl, /* * queue a vlocation record for updates */ -void afs_vlocation_queue_for_updates(struct afs_vlocation *vl) +static void afs_vlocation_queue_for_updates(struct afs_vlocation *vl) { struct afs_vlocation *xvl; @@ -381,7 +382,7 @@ struct afs_vlocation *afs_vlocation_lookup(struct afs_cell *cell, cell->name, key_serial(key), (int) namesz, (int) namesz, name, namesz); - if (namesz > sizeof(vl->vldb.name)) { + if (namesz >= sizeof(vl->vldb.name)) { _leave(" = -ENAMETOOLONG"); return ERR_PTR(-ENAMETOOLONG); } @@ -602,7 +603,7 @@ int __init afs_vlocation_update_init(void) /* * discard all the volume location records for rmmod */ -void __exit afs_vlocation_purge(void) +void afs_vlocation_purge(void) { afs_vlocation_timeout = 0;