Linus Torvalds 1e848913f0
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux ...
Pull nfsd fixes from Bruce Fields:
"Two main issues:
- We found that turning on pNFS by default (when it's configured at
build time) was too aggressive, so we want to switch the default
before the 4.0 release.
- Recent client changes to increase open parallelism uncovered a
serious bug lurking in the server's open code.
Also fix a krb5/selinux regression.
The rest is mainly smaller pNFS fixes"
* 'for-4.0' of git://linux-nfs.org/~bfields/linux:
sunrpc: make debugfs file creation failure non-fatal
nfsd: require an explicit option to enable pNFS
NFSD: Fix bad update of layout in nfsd4_return_file_layout
NFSD: Take care the return value from nfsd4_encode_stateid
NFSD: Printk blocklayout length and offset as format 0x%llx
nfsd: return correct lockowner when there is a race on hash insert
nfsd: return correct openowner when there is a race to put one in the hash
NFSD: Put exports after nfsd4_layout_verify fail
NFSD: Error out when register_shrinker() fail
NFSD: Take care the return value from nfsd4_decode_stateid
NFSD: Check layout type when returning client layouts
NFSD: restore trace event lost in mismerge
2015-04-01 09:45:47 -07:00
2015-02-10 10:23:15 +00:00
2015-01-29 10:54:43 +02:00
2014-12-07 21:22:09 +01:00
2015-02-19 13:31:40 +03:00
2015-02-03 11:06:11 -08:00
2015-01-15 17:23:22 +01:00
2014-12-14 14:57:16 -08:00
2015-01-29 18:49:57 +00:00
2015-02-01 11:50:35 -08:00
2015-03-08 05:34:35 +00:00
2014-11-24 17:24:08 -05:00
2015-03-17 12:19:14 +00:00
2015-03-02 15:27:19 -05:00
2014-12-15 18:19:03 -08:00
2015-02-11 10:56:48 -08:00
2015-02-18 08:01:44 -08:00
2015-02-11 10:28:45 -08:00
2015-03-05 10:08:14 +01:00
2015-02-21 12:59:04 -08:00
2015-01-21 20:52:07 +01:00
2015-03-18 11:42:30 +00:00
2015-02-16 17:56:05 -08:00
2015-03-03 14:14:26 +00:00
2015-01-29 10:49:28 +02:00
2015-03-31 14:15:08 -04:00
2015-02-26 17:02:15 +01:00
2015-02-05 15:09:26 +01:00
2015-01-28 18:45:23 -05:00
2015-01-28 18:45:23 -05:00
2014-12-25 15:27:16 -05:00
2014-11-10 12:40:48 +01:00
2015-02-17 15:27:47 -08:00
2015-02-17 16:12:34 -08:00
2015-02-17 21:33:27 +01:00
2014-12-13 12:42:51 -08:00
2015-02-05 09:30:43 -07:00
2015-02-13 21:21:39 -08:00
2014-11-16 09:55:39 +01:00
2014-12-22 16:43:06 +00:00
2015-01-08 08:59:01 -07:00
2015-02-12 14:13:23 -08:00
2015-02-11 11:24:14 -07:00
2014-11-13 16:17:06 -08:00
2014-12-05 21:47:32 -08:00
2014-11-07 11:45:00 -08:00
2015-01-20 14:02:58 -07:00
2015-01-06 12:02:46 -05:00
2015-01-06 12:02:46 -05:00
2015-02-18 09:40:07 -08:00
2015-03-11 15:56:59 -07:00
2014-11-20 10:43:16 -04:00
2014-12-30 18:29:25 -05:00
2014-12-18 19:08:10 -08:00
2015-02-11 17:06:04 -08:00
2015-01-27 09:37:53 +00:00
2015-02-13 21:21:42 -08:00
2015-02-13 21:21:42 -08:00
2015-02-13 21:21:40 -08:00
2015-02-21 10:27:33 -08:00
2015-02-04 10:42:55 -08:00
2014-12-17 09:00:04 -04:00
2014-11-07 11:45:00 -08:00
2015-01-23 23:06:44 +01:00
2015-03-05 23:13:19 +01:00
2015-02-13 21:21:39 -08:00
2014-12-05 17:19:27 -06:00
2015-01-20 14:44:19 +11:00
2015-02-12 18:54:15 -08:00
2015-02-22 11:38:38 -05:00
2015-02-17 12:21:51 -05:00
2015-01-30 17:56:40 +09:00
2014-12-19 22:55:06 +01:00
2015-02-27 14:53:16 -05:00
2015-01-26 15:57:59 -08:00
2014-12-01 16:50:45 +00:00
2015-02-02 16:55:43 -08:00
2014-11-18 11:18:35 +01:00
2015-01-21 19:21:30 +01:00
2014-11-10 09:27:30 -07:00
2014-11-25 15:42:53 +01:00
2015-02-11 18:03:54 -08:00
2014-11-24 07:45:02 +01:00
2015-01-09 15:44:19 +01:00
2015-01-02 15:46:41 -05:00
2014-12-08 21:07:10 -05:00
2015-02-05 14:35:17 +01:00
2015-02-11 17:04:48 -08:00
2014-12-13 12:42:52 -08:00
2015-01-15 13:33:41 +02:00
2014-12-31 13:06:50 -05:00
2014-12-10 17:41:10 -08:00
2014-12-05 21:47:32 -08:00
2015-01-25 23:17:28 -05:00
2015-02-18 10:21:47 -08:00
2014-12-13 12:42:53 -08:00
2015-02-10 14:30:28 -08:00
2015-02-12 08:37:41 -08:00
2014-12-15 10:17:38 -05:00
2015-01-16 17:04:25 -05:00
2015-02-11 17:06:04 -08:00
2014-12-10 15:17:46 -05:00
2015-01-27 10:19:12 -02:00
2015-02-17 13:34:44 +01:00
2014-12-17 09:13:13 +01:00
2015-01-27 10:09:14 +01:00
2015-01-23 12:13:20 +01:00
2015-02-12 18:54:08 -08:00
2014-12-10 17:41:04 -08:00
2015-02-11 17:06:01 -08:00
2014-12-26 08:33:34 +11:00
2015-01-25 09:18:00 -08:00
2015-02-21 12:41:50 -08:00
2015-01-27 11:09:13 +01:00
2014-11-17 09:49:17 +01:00
2015-01-18 00:23:57 -05:00
2015-02-05 14:33:28 -08:00
2014-11-14 17:08:58 -05:00
2015-02-13 21:21:41 -08:00
2014-11-17 23:12:01 -05:00
2015-03-04 21:42:19 +01:00
2014-11-07 10:09:07 -08:00
2014-12-16 14:53:01 -08:00
2015-01-19 16:11:59 +00:00
2015-01-19 14:55:22 +01:00
2014-12-16 15:53:03 -08:00
2014-12-11 15:04:11 -06:00
2014-12-11 15:04:06 -06:00
2015-02-02 19:28:04 -08:00
2014-12-10 09:01:01 -08:00
2015-03-04 21:42:19 +01:00
2014-11-23 13:01:46 +01:00
2014-11-23 13:01:46 +01:00
2015-01-15 10:34:54 +01:00
2015-01-15 10:34:54 +01:00
2015-03-12 18:46:08 -07:00
2015-02-19 12:39:02 -06:00
2014-12-10 17:41:11 -08:00
2014-12-13 13:33:07 +01:00
2015-02-12 18:54:13 -08:00
2015-02-13 21:21:36 -08:00
2015-02-17 14:34:51 -08:00
2014-12-13 12:42:47 -08:00
2015-01-13 16:10:16 +00:00
2015-01-24 10:11:12 +01:00
2015-02-13 09:55:09 -08:00
2014-12-18 09:39:51 +01:00
2015-01-26 14:59:08 -08:00
2015-01-26 14:59:08 -08:00
2015-02-11 16:47:46 +10:30
2015-03-19 14:14:43 -04:00
2015-02-12 18:54:10 -08:00
2015-01-04 23:11:43 -05:00
2014-11-20 14:45:15 +01:00
2015-02-04 11:25:51 +01:00
2015-01-25 23:16:29 -05:00
2014-11-27 12:50:59 +05:30
2014-11-30 16:40:11 +00:00
2015-01-12 05:04:10 -08:00
2015-02-12 18:54:09 -08:00
2014-11-21 14:08:56 -05:00
2015-02-12 18:54:08 -08:00
2015-02-11 17:06:04 -08:00
2015-02-16 17:56:03 -08:00
2014-12-15 15:52:01 -08:00
2015-02-11 17:06:02 -08:00
2015-02-17 17:41:19 -08:00
2015-03-18 10:46:39 -07:00
2015-03-12 18:46:08 -07:00
2014-11-23 17:14:43 +01:00
2015-02-14 11:32:59 -08:00
2014-12-10 21:32:13 -05:00
2015-02-01 23:16:33 -08:00
2015-03-17 14:58:39 -04:00
2014-12-27 03:07:50 -05:00
2015-02-12 10:39:41 -08:00
2015-02-03 11:06:34 -08:00
2015-03-03 13:02:29 -05:00
2015-02-03 11:06:52 -08:00
2015-02-03 11:06:45 -08:00
2015-02-18 13:11:09 -08:00
2015-02-13 21:21:39 -08:00
2014-12-10 21:30:20 -05:00
2015-02-19 16:15:37 -07:00
2015-01-15 17:23:17 +01:00
2014-12-05 14:35:52 +00:00
2014-11-12 07:49:38 -07:00
2015-03-13 09:45:24 -05:00
2014-12-11 13:06:58 -08:00
2014-11-20 12:11:25 -08:00
2014-11-27 12:51:04 +05:30
2015-02-11 17:06:03 -08:00
2015-01-14 15:07:32 +01:00
2015-02-11 17:06:02 -08:00
2015-02-11 17:06:07 -08:00
2014-12-13 12:42:48 -08:00
2015-01-28 14:03:09 +00:00
2014-11-13 16:17:05 -08:00
2014-12-29 12:45:45 -08:00
2014-11-13 10:35:25 -07:00
2014-12-14 14:57:16 -08:00
2015-02-10 15:09:41 -08:00
2014-12-13 12:42:53 -08:00
2015-01-06 10:26:10 -05:00
2014-11-21 11:19:15 -05:00
2015-02-16 14:58:12 -08:00
2015-01-09 11:12:28 +01:00
2014-12-16 15:02:23 -05:00
2015-01-27 00:16:51 -08:00
2015-01-25 23:17:28 -05:00
2014-11-06 15:16:02 -08:00
2014-11-20 14:45:15 +01:00
2014-11-07 01:46:51 +01:00
2015-02-03 22:56:53 +01:00
2014-11-29 23:53:20 +01:00
2014-12-04 00:46:58 +01:00
2014-12-12 15:26:48 -08:00
2015-02-03 22:59:25 +01:00
2015-02-02 10:11:25 -08:00
2015-02-12 18:54:15 -08:00
2014-12-10 21:30:20 -05:00
2015-01-16 16:01:10 -08:00
2015-01-16 16:01:10 -08:00
2014-12-10 17:41:10 -08:00
2014-12-22 20:17:23 +00:00
2015-01-30 12:51:21 +01:00
2015-01-30 12:50:32 +01:00
2014-12-13 12:42:52 -08:00
2015-02-17 14:34:52 -08:00
2015-01-06 11:01:13 -08:00
2015-01-15 23:34:34 -08:00
2015-01-15 23:34:34 -08:00
2015-01-15 23:34:34 -08:00
2015-01-27 13:13:04 +00:00
2015-02-05 15:09:25 +01:00
2015-02-27 16:06:02 -05:00
2014-11-10 16:45:43 -05:00
2015-02-16 17:56:03 -08:00
2015-01-23 17:21:57 -08:00
2014-12-09 13:36:57 -05:00
2015-03-25 16:20:31 -07:00
2015-01-25 09:17:57 -08:00
2015-02-13 21:21:39 -08:00
2015-02-13 21:21:39 -08:00
2015-02-02 10:11:27 -08:00
2014-11-06 14:57:24 -08:00
2015-03-07 03:39:55 +01:00
2015-01-09 14:25:39 -08:00
2015-02-12 18:54:09 -08:00
2015-03-11 23:51:18 -04:00
2015-02-12 18:54:09 -08:00
2015-02-13 21:21:41 -08:00
2015-02-13 21:21:41 -08:00
2015-01-22 15:10:56 +01:00
2015-02-04 01:34:15 -05:00
2015-01-03 14:32:57 -05:00
2015-01-03 14:32:57 -05:00
2015-01-03 14:32:57 -05:00
2014-11-26 19:33:57 -08:00
2015-01-06 11:04:27 -08:00
2014-12-13 12:42:48 -08:00
2015-02-12 18:54:13 -08:00
2015-02-13 21:21:35 -08:00
2015-02-13 23:49:36 +01:00
2014-12-10 17:41:09 -08:00
2015-02-11 17:06:00 -08:00
2015-02-12 18:54:08 -08:00
2015-01-27 09:38:00 +00:00
2014-11-07 10:53:25 -08:00
2014-11-17 10:28:04 -08:00
2015-02-08 01:03:13 -08:00
2015-02-24 14:40:42 -04:00
2015-02-03 15:48:51 -08:00
2015-02-15 19:40:09 +01:00
2015-01-22 12:28:02 +01:00
2015-01-02 16:47:35 -05:00
2015-01-23 17:21:55 -08:00
2014-11-19 22:01:15 -05:00
2015-02-07 19:34:25 -05:00
2015-02-02 10:11:28 -08:00
2015-02-12 18:54:13 -08:00
2015-01-05 22:44:46 -05:00
2014-11-07 10:09:07 -08:00
2015-02-17 22:21:11 -05:00
2015-01-25 20:54:17 +08:00
2014-12-17 12:31:40 -08:00
2014-12-04 14:31:00 -05:00
2014-11-28 16:08:16 +01:00
2015-02-10 12:37:47 -07:00
2014-12-09 12:05:24 +02:00
2014-12-14 18:21:31 +02:00
2015-01-23 14:57:10 +10:30
2014-12-17 10:37:56 -08:00
2014-12-13 12:42:48 -08:00
2015-03-12 18:46:08 -07:00
2015-02-04 01:34:14 -05:00
2014-12-15 23:49:28 +02:00
2015-02-02 10:09:54 -08:00
2015-02-12 14:30:53 -08:00
2015-03-05 08:04:13 -05:00
2015-01-08 15:10:51 -08:00
2015-02-12 18:54:12 -08:00
2015-02-12 18:54:12 -08:00
1e848913f0