From: J. Bruce Fields Date: Fri, 9 Mar 2012 22:02:28 +0000 (-0500) Subject: nfsd4: make sure set CB_PATH_DOWN sequence flag set X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8546ee518c6662ddb3075249fb31d89e5dbfb7d5;p=deliverable%2Flinux.git nfsd4: make sure set CB_PATH_DOWN sequence flag set Make sure this is set whenever there is no callback channel. If a client does not set up a callback channel at all, then it will get this flag set from the very start. That's OK, it can just ignore the flag if it doesn't care. If a client does care, I think it's better to inform it of the problem as early as possible. Reported-by: Rick Macklem Signed-off-by: J. Bruce Fields --- diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 6f3ebb48b12f..24b6bcf1e945 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -986,7 +986,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) err = setup_callback_client(clp, &conn, ses); if (err) { - warn_no_callback_path(clp, err); + nfsd4_mark_cb_down(clp, err); return; } /* Yay, the callback channel's back! Restart any callbacks: */