From: Greg Banks Date: Mon, 2 Oct 2006 09:17:49 +0000 (-0700) Subject: [PATCH] knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1 X-Git-Tag: v2.6.19-rc1~438 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc6f02e516b487ada46823fb05f237a0ef705f92;p=linux-2.6 [PATCH] knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1 Signed-off-by: Greg Banks Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 0e1f5d1f1c..eccd2c2eb6 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -1086,7 +1086,7 @@ static void *e_start(struct seq_file *m, loff_t *pos) 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, void *p, loff_t *pos) 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, void *p) 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;