Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6f02e5 authored by Greg Banks's avatar Greg Banks Committed by Linus Torvalds
Browse files

[PATCH] knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1 



Signed-off-by: default avatarGreg Banks <gnb@melbourne.sgi.com>
Acked-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b41b66d6

fs/nfsd/export.c

+3 −3
Original line number Diff line number Diff line
@@ -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;