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

Commit 4390110f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: (99 commits)
  svcrpc: svc_tcp_sendto XPT_DEAD check is redundant
  svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue
  svcrpc: assume svc_delete_xprt() called only once
  svcrpc: never clear XPT_BUSY on dead xprt
  nfsd4: fix connection allocation in sequence()
  nfsd4: only require krb5 principal for NFSv4.0 callbacks
  nfsd4: move minorversion to client
  nfsd4: delay session removal till free_client
  nfsd4: separate callback change and callback probe
  nfsd4: callback program number is per-session
  nfsd4: track backchannel connections
  nfsd4: confirm only on succesful create_session
  nfsd4: make backchannel sequence number per-session
  nfsd4: use client pointer to backchannel session
  nfsd4: move callback setup into session init code
  nfsd4: don't cache seq_misordered replies
  SUNRPC: Properly initialize sock_xprt.srcaddr in all cases
  SUNRPC: Use conventional switch statement when reclassifying sockets
  sunrpc/xprtrdma: clean up workqueue usage
  sunrpc: Turn list_for_each-s into the ..._entry-s
  ...

Fix up trivial conflicts (two different deprecation notices added in
separate branches) in Documentation/feature-removal-schedule.txt
parents a4dd8dce 42d7ba3d

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -535,3 +535,13 @@ Why: Hareware scan is the prefer method for iwlwifi devices for 
Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------



What:   access to nfsd auth cache through sys_nfsservctl or '.' files

        in the 'nfsd' filesystem.

When:   2.6.40

Why:    This is a legacy interface which have been replaced by a more

        dynamic cache.  Continuing to maintain this interface is an

        unnecessary burden.

Who:    NeilBrown <neilb@suse.de>



----------------------------

fs/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ obj-$(CONFIG_EVENTFD) += eventfd.o 
obj-$(CONFIG_AIO)               += aio.o

obj-$(CONFIG_FILE_LOCKING)      += locks.o

obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o



nfsd-$(CONFIG_NFSD)		:= nfsctl.o

obj-y				+= $(nfsd-y) $(nfsd-m)



obj-$(CONFIG_NFSD_DEPRECATED)	+= nfsctl.o

obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o

obj-$(CONFIG_BINFMT_EM86)	+= binfmt_em86.o

obj-$(CONFIG_BINFMT_MISC)	+= binfmt_misc.o

fs/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, 
}

#endif /* HAVE_SET_RESTORE_SIGMASK */



#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)

#if (defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && !defined(CONFIG_NFSD_DEPRECATED)

/* Stuff for NFS server syscalls... */

struct compat_nfsctl_svc {

	u16			svc32_port;

fs/lockd/host.c

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ nlm_bind_host(struct nlm_host *host) 
			.to_retries	= 5U,

		};

		struct rpc_create_args args = {

			.net		= &init_net,

			.protocol	= host->h_proto,

			.address	= nlm_addr(host),

			.addrsize	= host->h_addrlen,

fs/lockd/mon.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static struct rpc_clnt *nsm_create(void) 
		.sin_addr.s_addr	= htonl(INADDR_LOOPBACK),

	};

	struct rpc_create_args args = {

		.net			= &init_net,

		.protocol		= XPRT_TRANSPORT_UDP,

		.address		= (struct sockaddr *)&sin,

		.addrsize		= sizeof(sin),