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

Commit 2da8ca26 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSD: Clean up the idmapper warning... 



What part of 'internal use' is so hard to understand?

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e57aed77

fs/nfsd/nfs4idmap.c

+2 −2
Original line number Diff line number Diff line
@@ -175,10 +175,10 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) 
}



static void

warn_no_idmapd(struct cache_detail *detail)

warn_no_idmapd(struct cache_detail *detail, int has_died)

{

	printk("nfsd: nfsv4 idmapping failing: has idmapd %s?\n",

			detail->last_close? "died" : "not been started");

			has_died ? "died" : "not been started");

}

include/linux/sunrpc/cache.h

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ struct cache_detail { 
	int			(*cache_show)(struct seq_file *m,

					      struct cache_detail *cd,

					      struct cache_head *h);

	void			(*warn_no_listener)(struct cache_detail *cd,

					      int has_died);



	struct cache_head *	(*alloc)(void);

	int			(*match)(struct cache_head *orig, struct cache_head *new);
@@ -102,7 +104,6 @@ struct cache_detail { 
	atomic_t		readers;		/* how many time is /chennel open */

	time_t			last_close;		/* if no readers, when did last close */

	time_t			last_warn;		/* when we last warned about no readers */

	void			(*warn_no_listener)(struct cache_detail *cd);

};

net/sunrpc/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static void warn_no_listener(struct cache_detail *detail) 
	if (detail->last_warn != detail->last_close) {

		detail->last_warn = detail->last_close;

		if (detail->warn_no_listener)

			detail->warn_no_listener(detail);

			detail->warn_no_listener(detail, detail->last_close != 0);

	}

}