Messages in this thread | | | From | Neil Brown <> | Date | Tue, 25 Jul 2006 14:36:13 +1000 | Subject | Re: [NFS] [PATCH 002 of 9] knfsd: knfsd: Remove an unused variable from e_show(). |
| |
On Tuesday July 25, gnb@melbourne.sgi.com wrote: > On Tue, 2006-07-25 at 14:20, Neil Brown wrote: > > On Tuesday July 25, jsipek@fsl.cs.sunysb.edu wrote: > > > On Tue, Jul 25, 2006 at 11:54:32AM +1000, NeilBrown wrote: > > > ... > > > > Probably. We just need a pointer value that is definitely not a > > pointer to a valid cache_head object, and is not NULL. > > (void*)1 seems a reasonable choice, but maybe #defineing something > > would help. > > > > Patches welcome. > > This trivial patch compiles.
Cool... you learn something new every day! > -- > > knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1. > > Signed-off-by: Greg Banks <gnb@melbourne.sgi.com> Acked-by: NeilBrown <neilb@suse.de>
NeilBrown
> --- > > fs/nfsd/export.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > Index: linux/fs/nfsd/export.c > =================================================================== > --- linux.orig/fs/nfsd/export.c 2006-07-25 14:28:03.000000000 +1000 > +++ linux/fs/nfsd/export.c 2006-07-25 14:29:14.526574385 +1000 > @@ -1086,7 +1086,7 @@ static void *e_start(struct seq_file *m, > exp_readlock(); > read_lock(&svc_export_cache.hash_lock); > if (!n--) > - return (void*)1; > + return SEQ_START_TOKEN; > hash = n >> 32; > export = n & ((1LL<<32) - 1); > > @@ -1110,7 +1110,7 @@ static void *e_next(struct seq_file *m, > struct cache_head *ch = p; > int hash = (*pos >> 32); > > - if (p == (void*)1) > + if (p == SEQ_START_TOKEN) > hash = 0; > else if (ch->next == NULL) { > hash++; > @@ -1180,7 +1180,7 @@ static int e_show(struct seq_file *m, vo > struct svc_export *exp = container_of(cp, struct svc_export, h); > svc_client *clp; > > - if (p == (void*)1) { > + if (p == SEQ_START_TOKEN) { > seq_puts(m, "# Version 1.1\n"); > seq_puts(m, "# Path Client(Flags) # IPs\n"); > return 0; > > > > Greg. > -- > Greg Banks, R&D Software Engineer, SGI Australian Software Group. > I don't speak for SGI. > > > > ------------------------------------------------------------------------- > Take Surveys. Earn Cash. Influence the Future of IT > Join SourceForge.net's Techsay panel and you'll get the chance to share your > opinions on IT & business topics through brief surveys -- and earn cash > http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV > _______________________________________________ > NFS maillist - NFS@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/nfs - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |