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

Commit 8313064c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "The nfsd update this round is mainly a lot of miscellaneous cleanups
  and bugfixes.

  A couple changes could theoretically break working setups on upgrade.
  I don't expect complaints in practice, but they seem worth calling out
  just in case:

   - NFS security labels are now off by default; a new security_label
     export flag reenables it per export. But, having them on by default
     is a disaster, as it generally only makes sense if all your clients
     and servers have similar enough selinux policies. Thanks to Jason
     Tibbitts for pointing this out.

   - NFSv4/UDP support is off. It was never really supported, and the
     spec explicitly forbids it. We only ever left it on out of
     laziness; thanks to Jeff Layton for finally fixing that"

* tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux: (34 commits)
  nfsd: Fix display of the version string
  nfsd: fix configuration of supported minor versions
  sunrpc: don't register UDP port with rpcbind when version needs congestion control
  nfs/nfsd/sunrpc: enforce transport requirements for NFSv4
  sunrpc: flag transports as having congestion control
  sunrpc: turn bitfield flags in svc_version into bools
  nfsd: remove superfluous KERN_INFO
  nfsd: special case truncates some more
  nfsd: minor nfsd_setattr cleanup
  NFSD: Reserve adequate space for LOCKT operation
  NFSD: Get response size before operation for all RPCs
  nfsd/callback: Drop a useless data copy when comparing sessionid
  nfsd/callback: skip the callback tag
  nfsd/callback: Cleanup callback cred on shutdown
  nfsd/idmap: return nfserr_inval for 0-length names
  SUNRPC/Cache: Always treat the invalid cache as unexpired
  SUNRPC: Drop all entries from cache_detail when cache_purge()
  svcrdma: Poll CQs in "workqueue" mode
  svcrdma: Combine list fields in struct svc_rdma_op_ctxt
  svcrdma: Remove unused sc_dto_q field
  ...
parents b2deee2d ff7d1179

fs/lockd/svc.c

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ static int lockd_inet6addr_event(struct notifier_block *this, 
		dprintk("lockd_inet6addr_event: removed %pI6\n", &ifa->addr);

		sin6.sin6_family = AF_INET6;

		sin6.sin6_addr = ifa->addr;

		if (ipv6_addr_type(&sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL)

			sin6.sin6_scope_id = ifa->idev->dev->ifindex;

		svc_age_temp_xprts_now(nlmsvc_rqst->rq_server,

			(struct sockaddr *)&sin6);

	}

fs/nfs/callback_xdr.c

+4 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,8 @@ struct svc_version nfs4_callback_version1 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

	.vs_hidden = true,

	.vs_need_cong_ctrl = true,

};



struct svc_version nfs4_callback_version4 = {
@@ -1092,5 +1093,6 @@ struct svc_version nfs4_callback_version4 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

	.vs_hidden = true,

	.vs_need_cong_ctrl = true,

};

fs/nfsd/export.c

+1 −0
Original line number Diff line number Diff line
@@ -1102,6 +1102,7 @@ static struct flags { 
	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},

	{ NFSEXP_V4ROOT, {"v4root", ""}},

	{ NFSEXP_PNFS, {"pnfs", ""}},

	{ NFSEXP_SECURITY_LABEL, {"security_label", ""}},

	{ 0, {"", ""}}

};

fs/nfsd/nfs2acl.c

+0 −1
Original line number Diff line number Diff line
@@ -376,5 +376,4 @@ struct svc_version nfsd_acl_version2 = { 
		.vs_proc	= nfsd_acl_procedures2,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

		.vs_hidden	= 0,

};

fs/nfsd/nfs3acl.c

+0 −1
Original line number Diff line number Diff line
@@ -266,6 +266,5 @@ struct svc_version nfsd_acl_version3 = { 
		.vs_proc	= nfsd_acl_procedures3,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

		.vs_hidden	= 0,

};