Pull driver core fixes from Greg KH: "Here is one small sysfs change, and a documentation update for 5.0-rc2 The sysfs change moves from using BUG_ON to WARN_ON, as discussed in an email thread on lkml while trying to track down another driver bug. sysfs should not be crashing and preventing people from seeing where they went wrong. Now it properly recovers and warns the developer. The documentation update removes the use of BUS_ATTR() as the kernel is moving away from this to use the specific BUS_ATTR_RW() and friends instead. There are pending patches in all of the different subsystems to remove the last users of this macro, but for now, don't advertise it should be used anymore to keep new ones from being introduced. Both have been in linux-next with no reported issues" * tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: Documentation: driver core: remove use of BUS_ATTR sysfs: convert BUG_ON to WARN_ON
Unified · Split
| @@ -124,11 +124,11 @@ struct bus_attribute { · 123 unmodified lines | ||
| 124 | 124 | ssize_t (*store)(struct bus_type *, const char * buf, size_t count); |
| 125 | 125 | }; |
| 126 | 126 | |
| 127 | −Bus drivers can export attributes using the BUS_ATTR macro that works | |
| 128 | −similarly to the DEVICE_ATTR macro for devices. For example, a definition | |
| 129 | −like this: | |
| 127 | +Bus drivers can export attributes using the BUS_ATTR_RW macro that works | |
| 128 | +similarly to the DEVICE_ATTR_RW macro for devices. For example, a | |
| 129 | +definition like this: | |
| 130 | 130 | |
| 131 | −static BUS_ATTR(debug,0644,show_debug,store_debug); | |
| 131 | +static BUS_ATTR_RW(debug); | |
| 132 | 132 | |
| 133 | 133 | is equivalent to declaring: |
| 134 | 134 | |
| @@ -344,7 +344,9 @@ struct bus_attribute { · 343 unmodified lines | ||
| 344 | 344 | |
| 345 | 345 | Declaring: |
| 346 | 346 | |
| 347 | −BUS_ATTR(_name, _mode, _show, _store) | |
| 347 | +static BUS_ATTR_RW(name); | |
| 348 | +static BUS_ATTR_RO(name); | |
| 349 | +static BUS_ATTR_WO(name); | |
| 348 | 350 | |
| 349 | 351 | Creation/Removal: |
| 350 | 352 | |
| @@ -43,7 +43,8 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) · 42 unmodified lines | ||
| 43 | 43 | kuid_t uid; |
| 44 | 44 | kgid_t gid; |
| 45 | 45 | |
| 46 | − BUG_ON(!kobj); | |
| 46 | + if (WARN_ON(!kobj)) | |
| 47 | + return -EINVAL; | |
| 47 | 48 | |
| 48 | 49 | if (kobj->parent) |
| 49 | 50 | parent = kobj->parent->sd; |
| @@ -325,7 +325,8 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr, · 324 unmodified lines | ||
| 325 | 325 | kuid_t uid; |
| 326 | 326 | kgid_t gid; |
| 327 | 327 | |
| 328 | − BUG_ON(!kobj || !kobj->sd || !attr); | |
| 328 | + if (WARN_ON(!kobj || !kobj->sd || !attr)) | |
| 329 | + return -EINVAL; | |
| 329 | 330 | |
| 330 | 331 | kobject_get_ownership(kobj, &uid, &gid); |
| 331 | 332 | return sysfs_add_file_mode_ns(kobj->sd, attr, false, attr->mode, |
| @@ -537,7 +538,8 @@ int sysfs_create_bin_file(struct kobject *kobj, · 205 unmodified lines | ||
| 537 | 538 | kuid_t uid; |
| 538 | 539 | kgid_t gid; |
| 539 | 540 | |
| 540 | − BUG_ON(!kobj || !kobj->sd || !attr); | |
| 541 | + if (WARN_ON(!kobj || !kobj->sd || !attr)) | |
| 542 | + return -EINVAL; | |
| 541 | 543 | |
| 542 | 544 | kobject_get_ownership(kobj, &uid, &gid); |
| 543 | 545 | return sysfs_add_file_mode_ns(kobj->sd, &attr->attr, true, |
| @@ -112,7 +112,8 @@ static int internal_create_group(struct kobject *kobj, int update, · 111 unmodified lines | ||
| 112 | 112 | kgid_t gid; |
| 113 | 113 | int error; |
| 114 | 114 | |
| 115 | − BUG_ON(!kobj || (!update && !kobj->sd)); | |
| 115 | + if (WARN_ON(!kobj || (!update && !kobj->sd))) | |
| 116 | + return -EINVAL; | |
| 116 | 117 | |
| 117 | 118 | /* Updates may happen before the object has been instantiated */ |
| 118 | 119 | if (unlikely(update && !kobj->sd)) |
| @@ -23,7 +23,8 @@ static int sysfs_do_create_link_sd(struct kernfs_node *parent, · 22 unmodified lines | ||
| 23 | 23 | { |
| 24 | 24 | struct kernfs_node *kn, *target = NULL; |
| 25 | 25 | |
| 26 | − BUG_ON(!name || !parent); | |
| 26 | + if (WARN_ON(!name || !parent)) | |
| 27 | + return -EINVAL; | |
| 27 | 28 | |
| 28 | 29 | /* |
| 29 | 30 | * We don't own @target_kobj and it may be removed at any time. |