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 /mm/backing-dev.c | |
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 'mm/backing-dev.c')
-rw-r--r-- | mm/backing-dev.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 909dae445ea7..e8e89158adec 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
@@ -103,39 +103,25 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) | |||
103 | } | 103 | } |
104 | DEFINE_SHOW_ATTRIBUTE(bdi_debug_stats); | 104 | DEFINE_SHOW_ATTRIBUTE(bdi_debug_stats); |
105 | 105 | ||
106 | static int bdi_debug_register(struct backing_dev_info *bdi, const char *name) | 106 | static void bdi_debug_register(struct backing_dev_info *bdi, const char *name) |
107 | { | 107 | { |
108 | if (!bdi_debug_root) | ||
109 | return -ENOMEM; | ||
110 | |||
111 | bdi->debug_dir = debugfs_create_dir(name, bdi_debug_root); | 108 | bdi->debug_dir = debugfs_create_dir(name, bdi_debug_root); |
112 | if (!bdi->debug_dir) | ||
113 | return -ENOMEM; | ||
114 | |||
115 | bdi->debug_stats = debugfs_create_file("stats", 0444, bdi->debug_dir, | ||
116 | bdi, &bdi_debug_stats_fops); | ||
117 | if (!bdi->debug_stats) { | ||
118 | debugfs_remove(bdi->debug_dir); | ||
119 | bdi->debug_dir = NULL; | ||
120 | return -ENOMEM; | ||
121 | } | ||
122 | 109 | ||
123 | return 0; | 110 | debugfs_create_file("stats", 0444, bdi->debug_dir, bdi, |
111 | &bdi_debug_stats_fops); | ||
124 | } | 112 | } |
125 | 113 | ||
126 | static void bdi_debug_unregister(struct backing_dev_info *bdi) | 114 | static void bdi_debug_unregister(struct backing_dev_info *bdi) |
127 | { | 115 | { |
128 | debugfs_remove(bdi->debug_stats); | 116 | debugfs_remove_recursive(bdi->debug_dir); |
129 | debugfs_remove(bdi->debug_dir); | ||
130 | } | 117 | } |
131 | #else | 118 | #else |
132 | static inline void bdi_debug_init(void) | 119 | static inline void bdi_debug_init(void) |
133 | { | 120 | { |
134 | } | 121 | } |
135 | static inline int bdi_debug_register(struct backing_dev_info *bdi, | 122 | static inline void bdi_debug_register(struct backing_dev_info *bdi, |
136 | const char *name) | 123 | const char *name) |
137 | { | 124 | { |
138 | return 0; | ||
139 | } | 125 | } |
140 | static inline void bdi_debug_unregister(struct backing_dev_info *bdi) | 126 | static inline void bdi_debug_unregister(struct backing_dev_info *bdi) |
141 | { | 127 | { |