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