]> err.no Git - linux-2.6/commitdiff
[PATCH] knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1
authorGreg Banks <gnb@melbourne.sgi.com>
Mon, 2 Oct 2006 09:17:49 +0000 (02:17 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 2 Oct 2006 14:57:18 +0000 (07:57 -0700)
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/nfsd/export.c

index 0e1f5d1f1c144136299953b77e433bbdae082350..eccd2c2eb60de87d2c01c5ac6718360bfc626cdb 100644 (file)
@@ -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;