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