The patch titled
knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1
has been added to the -mm tree. Its filename is
knfsd-use-seq_start_token-instead-of-hardcoded-magic-void1.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1
From: Greg Banks <gnb@xxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Banks <gnb@xxxxxxxxxxxxxxxxx>
Acked-by: NeilBrown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/export.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/nfsd/export.c~knfsd-use-seq_start_token-instead-of-hardcoded-magic-void1 fs/nfsd/export.c
--- a/fs/nfsd/export.c~knfsd-use-seq_start_token-instead-of-hardcoded-magic-void1
+++ a/fs/nfsd/export.c
@@ -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;
_
Patches currently in -mm which might be from gnb@xxxxxxxxxxxxxxxxx are
knfsd-knfsd-add-some-missing-newlines-in-printks.patch
knfsd-knfsd-remove-an-unused-variable-from-e_show.patch
knfsd-knfsd-remove-an-unused-variable-from-auth_unix_lookup.patch
knfsd-use-seq_start_token-instead-of-hardcoded-magic-void1.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
