From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 21:17:26 +0000 (-0800)
Subject: Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.38-rc1~51
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=18bce371ae09af6c20ee62c1092a4d1d0e84dd49

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

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits)
  nfsd4: fix callback restarting
  nfsd: break lease on unlink, link, and rename
  nfsd4: break lease on nfsd setattr
  nfsd: don't support msnfs export option
  nfsd4: initialize cb_per_client
  nfsd4: allow restarting callbacks
  nfsd4: simplify nfsd4_cb_prepare
  nfsd4: give out delegations more quickly in 4.1 case
  nfsd4: add helper function to run callbacks
  nfsd4: make sure sequence flags are set after destroy_session
  nfsd4: re-probe callback on connection loss
  nfsd4: set sequence flag when backchannel is down
  nfsd4: keep finer-grained callback status
  rpc: allow xprt_class->setup to return a preexisting xprt
  rpc: keep backchannel xprt as long as server connection
  rpc: move sk_bc_xprt to svc_xprt
  nfsd4: allow backchannel recovery
  nfsd4: support BIND_CONN_TO_SESSION
  nfsd4: modify session list under cl_lock
  Documentation: fl_mylease no longer exists
  ...

Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work.  The
vfs-scale work touched some msnfs cases, and this merge removes support
for that entirely, so the conflict was trivial to resolve.
---

18bce371ae09af6c20ee62c1092a4d1d0e84dd49
diff --cc include/linux/sunrpc/svc_xprt.h
index 357da5e0daa3,7ad9751a0d87..059877b4d85b
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@@ -78,9 -77,9 +77,10 @@@ struct svc_xprt 
  	size_t			xpt_remotelen;	/* length of address */
  	struct rpc_wait_queue	xpt_bc_pending;	/* backchannel wait queue */
  	struct list_head	xpt_users;	/* callbacks on free */
 +	void			*xpt_bc_sid;	/* back channel session ID */
  
  	struct net		*xpt_net;
+ 	struct rpc_xprt		*xpt_bc_xprt;	/* NFSv4.1 backchannel */
  };
  
  static inline void unregister_xpt_user(struct svc_xprt *xpt, struct svc_xpt_user *u)