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.

diff --cc Documentation/filesystems/Locking
Simple merge

diff --cc fs/locks.c
Simple merge

diff --cc fs/nfsd/nfs4callback.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/nfs4.h
Simple merge

diff --cc include/linux/sunrpc/cache.h
Simple merge

diff --cc include/linux/sunrpc/svc.h
Simple merge

diff --cc include/linux/sunrpc/svc_xprt.h
index 357da5e0daa3308b0113009e0525f9a8cae3943d,7ad9751a0d8796e677fb2fdfd50cc4854bcf0eb7..059877b4d85b7c0734668bd9027745e0c10bea8b
--- 1/include/linux/sunrpc/svc_xprt.h
--- 2/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)

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge