diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
commit | f632a8170a6b667ee4e3f552087588f0fe13c4bb (patch) | |
tree | 9fbdd3505f1471364265727dea1bc9d034cbed8f /net/ceph | |
parent | ef8f3d48afd6a17a0dae8c277c2f539c2f19fd16 (diff) | |
parent | c33d442328f556460b79aba6058adb37bb555389 (diff) |
Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core and debugfs updates from Greg KH:
"Here is the "big" driver core and debugfs changes for 5.3-rc1
It's a lot of different patches, all across the tree due to some api
changes and lots of debugfs cleanups.
Other than the debugfs cleanups, in this set of changes we have:
- bus iteration function cleanups
- scripts/get_abi.pl tool to display and parse Documentation/ABI
entries in a simple way
- cleanups to Documenatation/ABI/ entries to make them parse easier
due to typos and other minor things
- default_attrs use for some ktype users
- driver model documentation file conversions to .rst
- compressed firmware file loading
- deferred probe fixes
All of these have been in linux-next for a while, with a bunch of
merge issues that Stephen has been patient with me for"
* tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (102 commits)
debugfs: make error message a bit more verbose
orangefs: fix build warning from debugfs cleanup patch
ubifs: fix build warning after debugfs cleanup patch
driver: core: Allow subsystems to continue deferring probe
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
arch_topology: Remove error messages on out-of-memory conditions
lib: notifier-error-inject: no need to check return value of debugfs_create functions
swiotlb: no need to check return value of debugfs_create functions
ceph: no need to check return value of debugfs_create functions
sunrpc: no need to check return value of debugfs_create functions
ubifs: no need to check return value of debugfs_create functions
orangefs: no need to check return value of debugfs_create functions
nfsd: no need to check return value of debugfs_create functions
lib: 842: no need to check return value of debugfs_create functions
debugfs: provide pr_fmt() macro
debugfs: log errors when something goes wrong
drivers: s390/cio: Fix compilation warning about const qualifiers
drivers: Add generic helper to match by of_node
driver_find_device: Unify the match function with class_find_device()
bus_find_device: Unify the match callback with class_find_device
...
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/ceph_common.c | 5 | ||||
-rw-r--r-- | net/ceph/debugfs.c | 33 |
2 files changed, 5 insertions, 33 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 1c811c74bfc0..4eeea4d5c3ef 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c | |||
@@ -776,9 +776,7 @@ static int __init init_ceph_lib(void) | |||
776 | { | 776 | { |
777 | int ret = 0; | 777 | int ret = 0; |
778 | 778 | ||
779 | ret = ceph_debugfs_init(); | 779 | ceph_debugfs_init(); |
780 | if (ret < 0) | ||
781 | goto out; | ||
782 | 780 | ||
783 | ret = ceph_crypto_init(); | 781 | ret = ceph_crypto_init(); |
784 | if (ret < 0) | 782 | if (ret < 0) |
@@ -803,7 +801,6 @@ out_crypto: | |||
803 | ceph_crypto_shutdown(); | 801 | ceph_crypto_shutdown(); |
804 | out_debugfs: | 802 | out_debugfs: |
805 | ceph_debugfs_cleanup(); | 803 | ceph_debugfs_cleanup(); |
806 | out: | ||
807 | return ret; | 804 | return ret; |
808 | } | 805 | } |
809 | 806 | ||
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index 63aef9915f75..7cb992e55475 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c | |||
@@ -389,12 +389,9 @@ CEPH_DEFINE_SHOW_FUNC(monc_show) | |||
389 | CEPH_DEFINE_SHOW_FUNC(osdc_show) | 389 | CEPH_DEFINE_SHOW_FUNC(osdc_show) |
390 | CEPH_DEFINE_SHOW_FUNC(client_options_show) | 390 | CEPH_DEFINE_SHOW_FUNC(client_options_show) |
391 | 391 | ||
392 | int __init ceph_debugfs_init(void) | 392 | void __init ceph_debugfs_init(void) |
393 | { | 393 | { |
394 | ceph_debugfs_dir = debugfs_create_dir("ceph", NULL); | 394 | ceph_debugfs_dir = debugfs_create_dir("ceph", NULL); |
395 | if (!ceph_debugfs_dir) | ||
396 | return -ENOMEM; | ||
397 | return 0; | ||
398 | } | 395 | } |
399 | 396 | ||
400 | void ceph_debugfs_cleanup(void) | 397 | void ceph_debugfs_cleanup(void) |
@@ -402,9 +399,8 @@ void ceph_debugfs_cleanup(void) | |||
402 | debugfs_remove(ceph_debugfs_dir); | 399 | debugfs_remove(ceph_debugfs_dir); |
403 | } | 400 | } |
404 | 401 | ||
405 | int ceph_debugfs_client_init(struct ceph_client *client) | 402 | void ceph_debugfs_client_init(struct ceph_client *client) |
406 | { | 403 | { |
407 | int ret = -ENOMEM; | ||
408 | char name[80]; | 404 | char name[80]; |
409 | 405 | ||
410 | snprintf(name, sizeof(name), "%pU.client%lld", &client->fsid, | 406 | snprintf(name, sizeof(name), "%pU.client%lld", &client->fsid, |
@@ -412,56 +408,37 @@ int ceph_debugfs_client_init(struct ceph_client *client) | |||
412 | 408 | ||
413 | dout("ceph_debugfs_client_init %p %s\n", client, name); | 409 | dout("ceph_debugfs_client_init %p %s\n", client, name); |
414 | 410 | ||
415 | BUG_ON(client->debugfs_dir); | ||
416 | client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir); | 411 | client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir); |
417 | if (!client->debugfs_dir) | ||
418 | goto out; | ||
419 | 412 | ||
420 | client->monc.debugfs_file = debugfs_create_file("monc", | 413 | client->monc.debugfs_file = debugfs_create_file("monc", |
421 | 0400, | 414 | 0400, |
422 | client->debugfs_dir, | 415 | client->debugfs_dir, |
423 | client, | 416 | client, |
424 | &monc_show_fops); | 417 | &monc_show_fops); |
425 | if (!client->monc.debugfs_file) | ||
426 | goto out; | ||
427 | 418 | ||
428 | client->osdc.debugfs_file = debugfs_create_file("osdc", | 419 | client->osdc.debugfs_file = debugfs_create_file("osdc", |
429 | 0400, | 420 | 0400, |
430 | client->debugfs_dir, | 421 | client->debugfs_dir, |
431 | client, | 422 | client, |
432 | &osdc_show_fops); | 423 | &osdc_show_fops); |
433 | if (!client->osdc.debugfs_file) | ||
434 | goto out; | ||
435 | 424 | ||
436 | client->debugfs_monmap = debugfs_create_file("monmap", | 425 | client->debugfs_monmap = debugfs_create_file("monmap", |
437 | 0400, | 426 | 0400, |
438 | client->debugfs_dir, | 427 | client->debugfs_dir, |
439 | client, | 428 | client, |
440 | &monmap_show_fops); | 429 | &monmap_show_fops); |
441 | if (!client->debugfs_monmap) | ||
442 | goto out; | ||
443 | 430 | ||
444 | client->debugfs_osdmap = debugfs_create_file("osdmap", | 431 | client->debugfs_osdmap = debugfs_create_file("osdmap", |
445 | 0400, | 432 | 0400, |
446 | client->debugfs_dir, | 433 | client->debugfs_dir, |
447 | client, | 434 | client, |
448 | &osdmap_show_fops); | 435 | &osdmap_show_fops); |
449 | if (!client->debugfs_osdmap) | ||
450 | goto out; | ||
451 | 436 | ||
452 | client->debugfs_options = debugfs_create_file("client_options", | 437 | client->debugfs_options = debugfs_create_file("client_options", |
453 | 0400, | 438 | 0400, |
454 | client->debugfs_dir, | 439 | client->debugfs_dir, |
455 | client, | 440 | client, |
456 | &client_options_show_fops); | 441 | &client_options_show_fops); |
457 | if (!client->debugfs_options) | ||
458 | goto out; | ||
459 | |||
460 | return 0; | ||
461 | |||
462 | out: | ||
463 | ceph_debugfs_client_cleanup(client); | ||
464 | return ret; | ||
465 | } | 442 | } |
466 | 443 | ||
467 | void ceph_debugfs_client_cleanup(struct ceph_client *client) | 444 | void ceph_debugfs_client_cleanup(struct ceph_client *client) |
@@ -477,18 +454,16 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client) | |||
477 | 454 | ||
478 | #else /* CONFIG_DEBUG_FS */ | 455 | #else /* CONFIG_DEBUG_FS */ |
479 | 456 | ||
480 | int __init ceph_debugfs_init(void) | 457 | void __init ceph_debugfs_init(void) |
481 | { | 458 | { |
482 | return 0; | ||
483 | } | 459 | } |
484 | 460 | ||
485 | void ceph_debugfs_cleanup(void) | 461 | void ceph_debugfs_cleanup(void) |
486 | { | 462 | { |
487 | } | 463 | } |
488 | 464 | ||
489 | int ceph_debugfs_client_init(struct ceph_client *client) | 465 | void ceph_debugfs_client_init(struct ceph_client *client) |
490 | { | 466 | { |
491 | return 0; | ||
492 | } | 467 | } |
493 | 468 | ||
494 | void ceph_debugfs_client_cleanup(struct ceph_client *client) | 469 | void ceph_debugfs_client_cleanup(struct ceph_client *client) |