Linus Torvalds 18bce371ae
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.
2011-01-14 13:17:26 -08:00
2011-01-13 20:15:35 -08:00
2010-12-22 19:43:34 -08:00
2010-12-13 23:42:12 -05:00
2010-08-04 15:21:40 +02:00
2011-01-06 19:13:58 -08:00
2009-09-24 07:20:57 -07:00
2010-08-06 12:55:52 -04:00
2010-11-11 12:09:59 +01:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2011-01-14 07:52:02 -08:00
2010-04-23 02:09:52 +02:00
2010-02-24 13:51:32 +01:00
2010-01-13 10:55:16 -05:00
2008-10-16 11:21:30 -07:00
2009-08-29 19:09:27 -07:00
2010-11-18 15:00:47 -08:00
2011-01-13 20:00:02 +00:00
2011-01-13 10:05:56 -08:00
2010-11-10 16:57:11 -08:00
2010-12-29 08:16:30 -02:00
2010-03-06 11:26:32 -08:00
2011-01-06 18:10:09 +09:00
2011-01-14 13:17:26 -08:00
2010-08-05 13:53:34 -07:00
2011-01-12 21:55:13 +01:00
2011-01-10 22:11:23 +01:00
2010-08-04 15:21:40 +02:00
2009-06-07 13:52:52 +02:00
2010-08-04 15:21:40 +02:00
2011-01-11 01:07:55 -08:00
2011-01-13 08:03:21 -08:00
2010-08-04 15:31:02 -07:00
2010-08-04 15:21:40 +02:00
2011-01-10 08:57:03 -08:00
2010-11-25 14:36:38 +01:00
2010-11-15 23:50:13 +01:00
2011-01-13 10:14:24 -08:00
2010-08-16 11:54:50 -04:00
2010-11-12 07:55:32 -08:00
2010-11-15 23:50:13 +01:00
2010-12-14 22:16:19 +01:00
2009-01-14 19:19:03 +01:00
2010-10-26 16:52:14 -07:00
2010-08-12 08:43:30 -07:00
2009-06-12 18:01:47 +02:00
2010-08-04 15:21:40 +02:00
2010-04-23 02:09:52 +02:00
2011-01-13 10:05:56 -08:00
2011-01-13 08:03:19 -08:00
2010-07-11 22:17:45 +02:00
2010-09-29 17:20:24 +02:00
2010-12-24 15:02:41 +01:00
2011-01-13 10:05:56 -08:00
2011-01-13 08:03:21 -08:00
2010-11-29 22:01:59 -08:00
2010-08-04 15:21:40 +02:00
2010-11-02 22:47:39 -04:00
2011-01-13 10:05:56 -08:00
2011-01-13 08:03:20 -08:00
2010-11-15 18:25:12 +09:00
2011-01-13 08:37:19 +01:00
2008-08-29 02:15:25 -07:00
2010-12-01 12:18:33 +01:00
2011-01-13 08:03:18 -08:00
2010-08-04 15:21:40 +02:00
2011-01-12 00:08:35 -05:00
2010-11-01 15:38:34 -04:00
2011-01-13 10:05:56 -08:00
2010-08-04 15:21:40 +02:00
2010-11-16 14:03:41 -08:00
2010-12-29 08:17:17 -02:00
2011-01-13 17:32:38 -08:00
2011-01-13 08:03:22 -08:00
2010-07-01 16:02:55 +00:00
2009-01-07 10:00:18 -08:00
2011-01-13 08:03:25 -08:00
2010-11-15 23:50:13 +01:00
2010-04-08 11:34:34 +02:00
2010-08-12 08:43:30 -07:00
2010-08-02 15:35:15 +10:00
2010-04-23 02:09:52 +02:00
2008-12-03 16:09:53 -07:00
2010-08-04 15:21:40 +02:00
2009-06-12 18:01:47 +02:00
2008-07-25 10:53:30 -07:00
2009-08-22 14:25:32 -07:00
2010-07-20 17:49:30 +00:00
2010-04-23 02:09:52 +02:00
2010-07-11 21:55:42 +02:00
2010-03-24 16:31:22 -07:00
2010-12-03 12:27:01 +01:00
2009-06-12 18:01:46 +02:00
2010-08-11 23:04:10 +09:30
2010-09-09 20:41:25 +02:00
2010-07-29 15:16:18 -07:00
2009-10-03 09:28:11 +02:00
2009-06-12 18:01:50 +02:00
2010-10-28 09:35:11 -07:00
2010-08-14 11:56:46 -07:00
2010-08-11 08:59:21 -07:00
2008-07-22 10:39:36 +10:00
2009-01-05 18:10:19 -07:00
2011-01-06 09:59:37 -08:00
2010-10-22 10:16:42 -07:00
2010-11-25 17:32:47 +01:00
2010-02-05 12:22:39 +01:00
2011-01-13 08:03:15 -08:00
2011-01-13 20:15:35 -08:00
2009-10-15 07:25:20 -06:00
2009-05-09 07:12:50 +02:00
2009-09-21 15:14:56 +02:00
2011-01-13 17:26:46 -08:00
2010-08-04 15:21:40 +02:00
2010-03-06 11:26:29 -08:00
2010-08-04 15:21:40 +02:00
2009-09-19 09:37:23 -07:00
2008-11-03 18:21:44 +01:00
2011-01-03 14:00:28 +01:00
2010-12-14 00:22:00 -05:00
2010-09-11 16:49:21 -07:00
2011-01-06 09:59:38 -08:00
2011-01-13 20:15:35 -08:00
2010-11-29 08:55:25 +11:00
2009-09-02 21:29:22 +10:00
2009-07-01 22:36:22 +02:00
2009-09-08 16:36:08 +01:00
2010-03-19 07:12:20 -07:00
2010-11-01 15:38:34 -04:00
2009-09-18 09:48:52 -07:00
2010-08-04 15:21:40 +02:00
2010-11-12 07:55:32 -08:00
2009-06-23 20:21:38 +01:00
2009-06-12 18:01:47 +02:00
2009-08-07 12:03:46 +02:00
2009-12-06 13:20:02 +01:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2011-01-12 20:02:48 -05:00
2010-12-29 08:17:12 -02:00
2008-10-30 11:38:46 -07:00
2010-08-04 15:21:40 +02:00
2010-03-24 16:31:22 -07:00
2009-12-15 08:53:17 -08:00
2009-09-22 07:17:26 -07:00
2010-09-03 08:19:51 +02:00
2008-10-30 19:07:04 +01:00
2009-12-15 08:53:24 -08:00
2009-09-22 07:17:39 -07:00
2010-05-19 08:37:43 +01:00
2010-08-11 08:59:18 -07:00
2010-02-05 12:22:44 +01:00
2008-11-12 17:17:17 -08:00
2010-11-11 12:09:59 +01:00
2010-03-10 17:09:33 -05:00
2009-06-18 13:03:56 -07:00
2010-06-05 17:39:09 +02:00
2009-09-23 07:39:46 -07:00
2008-10-16 11:21:32 -07:00
2008-08-27 08:54:08 +10:00
2009-06-12 18:01:47 +02:00
2010-04-23 02:09:52 +02:00
2010-07-19 10:56:54 +02:00
2009-12-14 09:46:56 -08:00
2010-04-22 15:24:56 -07:00
2010-05-24 07:31:20 -07:00
2010-08-04 15:21:40 +02:00
2010-08-09 20:45:05 -07:00
2010-03-16 11:47:56 +01:00
2010-10-26 17:32:41 -07:00
2010-08-02 15:35:10 +10:00
2008-07-25 10:53:27 -07:00
2009-12-16 11:28:58 -08:00
2010-03-24 16:31:20 -07:00
2010-10-11 15:20:26 +02:00
2011-01-13 08:03:24 -08:00
18bce371ae
