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

Commit b03568c3 authored by \"J. Bruce Fields\'s avatar \"J. Bruce Fields\ Committed by Trond Myklebust
Browse files

rpc: factor out warning code from gss_pipe_destroy_msg 



We'll want to call this from elsewhere soon.  And this is a bit nicer
anyway.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 99db3563

net/sunrpc/auth_gss/auth_gss.c

+14 −9
Original line number Diff line number Diff line
@@ -369,6 +369,18 @@ gss_setup_upcall(struct rpc_clnt *clnt, struct gss_auth *gss_auth, struct rpc_cr 
	return gss_msg;

}



static void warn_gssd(void)

{

	static unsigned long ratelimit;

	unsigned long now = jiffies;



	if (time_after(now, ratelimit)) {

		printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"

				"Please check user daemon is running.\n");

		ratelimit = now + 15*HZ;

	}

}



static inline int

gss_refresh_upcall(struct rpc_task *task)

{
@@ -568,21 +580,14 @@ static void 
gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)

{

	struct gss_upcall_msg *gss_msg = container_of(msg, struct gss_upcall_msg, msg);

	static unsigned long ratelimit;



	if (msg->errno < 0) {

		dprintk("RPC:       gss_pipe_destroy_msg releasing msg %p\n",

				gss_msg);

		atomic_inc(&gss_msg->count);

		gss_unhash_msg(gss_msg);

		if (msg->errno == -ETIMEDOUT) {

			unsigned long now = jiffies;

			if (time_after(now, ratelimit)) {

				printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"

						    "Please check user daemon is running!\n");

				ratelimit = now + 15*HZ;

			}

		}

		if (msg->errno == -ETIMEDOUT)

			warn_gssd();

		gss_release_msg(gss_msg);

	}

}