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

Commit 99091700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

   - Stable patch from Olga to fix RPCSEC_GSS upcalls when the same user
     needs multiple different security services (e.g.  krb5i and krb5p).

   - Stable patch to fix a regression introduced by the use of
     SO_REUSEPORT, and that prevented the use of multiple different NFS
     versions to the same server.

   - TCP socket reconnection timer fixes.

   - Patch from Neil to disable the use of IPv6 temporary addresses"

* tag 'nfs-for-4.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Cap the transport reconnection timer at 1/2 lease period
  NFSv4: Cleanup the setting of the nfs4 lease period
  SUNRPC: Limit the reconnect backoff timer to the max RPC message timeout
  SUNRPC: Fix reconnection timeouts
  NFSv4.2: LAYOUTSTATS may return NFS4ERR_ADMIN/DELEG_REVOKED
  SUNRPC: disable the use of IPv6 temporary addresses.
  SUNRPC: allow for upcalls for same uid but different gss service
  SUNRPC: Fix up socket autodisconnect
  SUNRPC: Handle EADDRNOTAVAIL on connection failures
parents c239ae10 8d480326

fs/nfs/nfs42proc.c

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata) 
	case 0:

		break;

	case -NFS4ERR_EXPIRED:

	case -NFS4ERR_ADMIN_REVOKED:

	case -NFS4ERR_DELEG_REVOKED:

	case -NFS4ERR_STALE_STATEID:

	case -NFS4ERR_OLD_STATEID:

	case -NFS4ERR_BAD_STATEID:

fs/nfs/nfs4_fs.h

+4 −0
Original line number Diff line number Diff line
@@ -396,6 +396,10 @@ extern void nfs4_schedule_state_renewal(struct nfs_client *); 
extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);

extern void nfs4_kill_renewd(struct nfs_client *);

extern void nfs4_renew_state(struct work_struct *);

extern void nfs4_set_lease_period(struct nfs_client *clp,

		unsigned long lease,

		unsigned long lastrenewed);





/* nfs4state.c */

struct rpc_cred *nfs4_get_clid_cred(struct nfs_client *clp);

fs/nfs/nfs4proc.c

+3 −6
Original line number Diff line number Diff line
@@ -4237,12 +4237,9 @@ static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, str 
		err = _nfs4_do_fsinfo(server, fhandle, fsinfo);

		trace_nfs4_fsinfo(server, fhandle, fsinfo->fattr, err);

		if (err == 0) {

			struct nfs_client *clp = server->nfs_client;



			spin_lock(&clp->cl_lock);

			clp->cl_lease_time = fsinfo->lease_time * HZ;

			clp->cl_last_renewal = now;

			spin_unlock(&clp->cl_lock);

			nfs4_set_lease_period(server->nfs_client,

					fsinfo->lease_time * HZ,

					now);

			break;

		}

		err = nfs4_handle_exception(server, err, &exception);

fs/nfs/nfs4renewd.c

+20 −0
Original line number Diff line number Diff line
@@ -136,6 +136,26 @@ nfs4_kill_renewd(struct nfs_client *clp) 
	cancel_delayed_work_sync(&clp->cl_renewd);

}



/**

 * nfs4_set_lease_period - Sets the lease period on a nfs_client

 *

 * @clp: pointer to nfs_client

 * @lease: new value for lease period

 * @lastrenewed: time at which lease was last renewed

 */

void nfs4_set_lease_period(struct nfs_client *clp,

		unsigned long lease,

		unsigned long lastrenewed)

{

	spin_lock(&clp->cl_lock);

	clp->cl_lease_time = lease;

	clp->cl_last_renewal = lastrenewed;

	spin_unlock(&clp->cl_lock);



	/* Cap maximum reconnect timeout at 1/2 lease period */

	rpc_cap_max_reconnect_timeout(clp->cl_rpcclient, lease >> 1);

}



/*

 * Local variables:

 *   c-basic-offset: 8

fs/nfs/nfs4state.c

+3 −6
Original line number Diff line number Diff line
@@ -277,20 +277,17 @@ static int nfs41_setup_state_renewal(struct nfs_client *clp) 
{

	int status;

	struct nfs_fsinfo fsinfo;

	unsigned long now;



	if (!test_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state)) {

		nfs4_schedule_state_renewal(clp);

		return 0;

	}



	now = jiffies;

	status = nfs4_proc_get_lease_time(clp, &fsinfo);

	if (status == 0) {

		/* Update lease time and schedule renewal */

		spin_lock(&clp->cl_lock);

		clp->cl_lease_time = fsinfo.lease_time * HZ;

		clp->cl_last_renewal = jiffies;

		spin_unlock(&clp->cl_lock);



		nfs4_set_lease_period(clp, fsinfo.lease_time * HZ, now);

		nfs4_schedule_state_renewal(clp);

	}