On Fri, 2011-11-18 at 17:20 +0100, John Hughes wrote:
> Don't write anything to the log if a user Kerberos ticket expires or is missing,
> these are not kernel problems.
>
> Signed-off-by: John Hughes<john@xxxxxxxxx>
>
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 39914be..18897cb 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -1339,14 +1339,6 @@ static void nfs4_state_start_reclaim_nograce(struct nfs_client *clp)
> nfs4_state_mark_reclaim_helper(clp, nfs4_state_mark_reclaim_nograce);
> }
>
> -static void nfs4_warn_keyexpired(const char *s)
> -{
> - printk_ratelimited(KERN_WARNING "Error: state manager"
> - " encountered RPCSEC_GSS session"
> - " expired against NFSv4 server %s.\n",
> - s);
> -}
NACK. This is useful.
> -
> static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)
> {
> switch (error) {
> @@ -1378,7 +1370,6 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)
> return 0;
> case -EKEYEXPIRED:
> /* Nothing we can do */
> - nfs4_warn_keyexpired(clp->cl_hostname);
> return 0;
> }
> return error;
> @@ -1620,7 +1611,6 @@ static void nfs4_set_lease_expired(struct nfs_client *clp, int status)
> break;
>
> case -EKEYEXPIRED:
> - nfs4_warn_keyexpired(clp->cl_hostname);
NACK. This means that the server can't even recover it's lease. It
shouldn't even trigger if you install a machine credential.
> case -NFS4ERR_NOT_SAME: /* FixMe: implement recovery
> * in nfs4_exchange_id */
> default:
> @@ -1728,8 +1718,9 @@ static void nfs4_state_manager(struct nfs_client *clp)
> } while (atomic_read(&clp->cl_count)> 1);
> return;
> out_error:
> - printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
> - " with error %d\n", clp->cl_hostname, -status);
> + if (status != -EACCESS)
> + printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
> + " with error %d\n", clp->cl_hostname, -status);
Obviously not even compile tested...
> nfs4_end_drain_session(clp);
> nfs4_clear_state_manager_bit(clp);
> }
>
>
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
