Messages in this thread Patch in this message | | | Subject | Re: [NFS] [PATCH 002 of 9] knfsd: knfsd: Remove an unused variable from e_show(). | From | Greg Banks <> | Date | Tue, 25 Jul 2006 15:53:11 +1000 |
| |
On Tue, 2006-07-25 at 14:32, Greg Banks 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.
But only applies to sles10 <sigh>. Here's the version which applies to today's GIT. --
knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1.
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com> ---
fs/nfsd/export.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Index: linus-git/fs/nfsd/export.c =================================================================== --- linus-git.orig/fs/nfsd/export.c 2006-07-25 14:55:28.000000000 +1000 +++ linus-git/fs/nfsd/export.c 2006-07-25 15:40:03.987257265 +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++; @@ -1179,7 +1179,7 @@ static int e_show(struct seq_file *m, vo struct cache_head *cp = p; struct svc_export *exp = container_of(cp, struct svc_export, h); - 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.
- 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/
| |