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

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

Merge tag 'nfs-for-3.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client updates from Trond Myklebust:
 "Feature highlights include:
   - Add basic client support for NFSv4.2
   - Add basic client support for Labeled NFS (selinux for NFSv4.2)
   - Fix the use of credentials in NFSv4.1 stateful operations, and add
     support for NFSv4.1 state protection.

  Bugfix highlights:
   - Fix another NFSv4 open state recovery race
   - Fix an NFSv4.1 back channel session regression
   - Various rpc_pipefs races
   - Fix another issue with NFSv3 auth negotiation

  Please note that Labeled NFS does require some additional support from
  the security subsystem.  The relevant changesets have all been
  reviewed and acked by James Morris."

* tag 'nfs-for-3.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (54 commits)
  NFS: Set NFS_CS_MIGRATION for NFSv4 mounts
  NFSv4.1 Refactor nfs4_init_session and nfs4_init_channel_attrs
  nfs: have NFSv3 try server-specified auth flavors in turn
  nfs: have nfs_mount fake up a auth_flavs list when the server didn't provide it
  nfs: move server_authlist into nfs_try_mount_request
  nfs: refactor "need_mount" code out of nfs_try_mount
  SUNRPC: PipeFS MOUNT notification optimization for dying clients
  SUNRPC: split client creation routine into setup and registration
  SUNRPC: fix races on PipeFS UMOUNT notifications
  SUNRPC: fix races on PipeFS MOUNT notifications
  NFSv4.1 use pnfs_device maxcount for the objectlayout gdia_maxcount
  NFSv4.1 use pnfs_device maxcount for the blocklayout gdia_maxcount
  NFSv4.1 Fix gdia_maxcount calculation to fit in ca_maxresponsesize
  NFS: Improve legacy idmapping fallback
  NFSv4.1 end back channel session draining
  NFS: Apply v4.1 capabilities to v4.2
  NFSv4.1: Clean up layout segment comparison helper names
  NFSv4.1: layout segment comparison helpers should take 'const' parameters
  NFSv4: Move the DNS resolver into the NFSv4 module
  rpc_pipefs: only set rpc_dentry_ops if d_op isn't already set
  ...
parents 1f792dd1 959d921f

fs/nfs/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -104,6 +104,15 @@ config NFS_V4_1 


	  If unsure, say N.



config NFS_V4_2

	bool "NFS client support for NFSv4.2"

	depends on NFS_V4_1

	help

	  This option enables support for minor version 2 of the NFSv4 protocol

	  in the kernel's NFS client.



	  If unsure, say N.



config PNFS_FILE_LAYOUT

	tristate

	depends on NFS_V4_1
@@ -131,6 +140,11 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN 
	  If the NFS client is unchanged from the upstream kernel, this

	  option should be set to the default "kernel.org".



config NFS_V4_SECURITY_LABEL

	bool

	depends on NFS_V4_2 && SECURITY

	default y



config ROOT_NFS

	bool "Root file system on NFS"

	depends on NFS_FS=y && IP_PNP

fs/nfs/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ obj-$(CONFIG_NFS_FS) += nfs.o 


nfs-y 			:= client.o dir.o file.o getroot.o inode.o super.o \

			   direct.o pagelist.o read.o symlink.o unlink.o \

			   write.o namespace.o mount_clnt.o \

			   dns_resolve.o cache_lib.o

			   write.o namespace.o mount_clnt.o

nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o

nfs-$(CONFIG_SYSCTL)	+= sysctl.o

nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o
@@ -22,7 +21,8 @@ nfsv3-$(CONFIG_NFS_V3_ACL) += nfs3acl.o 
obj-$(CONFIG_NFS_V4) += nfsv4.o

nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \

	  delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \

	  nfs4namespace.o nfs4getroot.o nfs4client.o

	  nfs4namespace.o nfs4getroot.o nfs4client.o dns_resolve.o

nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o

nfsv4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfsv4-$(CONFIG_NFS_V4_1)	+= nfs4session.o pnfs.o pnfs_dev.o

fs/nfs/blocklayout/blocklayout.c

+2 −1
Original line number Diff line number Diff line
@@ -1089,9 +1089,10 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh, 
	dev->pgbase = 0;

	dev->pglen = PAGE_SIZE * max_pages;

	dev->mincount = 0;

	dev->maxcount = max_resp_sz - nfs41_maxgetdevinfo_overhead;



	dprintk("%s: dev_id: %s\n", __func__, dev->dev_id.data);

	rc = nfs4_proc_getdeviceinfo(server, dev);

	rc = nfs4_proc_getdeviceinfo(server, dev, NULL);

	dprintk("%s getdevice info returns %d\n", __func__, rc);

	if (rc) {

		rv = ERR_PTR(rc);

fs/nfs/callback.c

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n 
			ret = nfs4_callback_up_net(serv, net);

			break;

		case 1:

		case 2:

			ret = nfs41_callback_up_net(serv, net);

			break;

		default:

fs/nfs/callback.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ enum nfs4_callback_opnum { 
	OP_CB_WANTS_CANCELLED = 12,

	OP_CB_NOTIFY_LOCK   = 13,

	OP_CB_NOTIFY_DEVICEID = 14,

/* Callback operations new to NFSv4.2 */

	OP_CB_OFFLOAD = 15,

	OP_CB_ILLEGAL = 10044,

};
@@ -39,6 +41,7 @@ struct cb_process_state { 
	__be32			drc_status;

	struct nfs_client	*clp;

	u32			slotid;

	u32			minorversion;

	struct net		*net;

};