mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
block: rbd: convert to use BUS_ATTR_WO and RO
We are trying to get rid of BUS_ATTR() and the usage of that in rbd.c can be trivially converted to use BUS_ATTR_WO and RO, so use those macros instead. Cc: Sage Weil <sage@redhat.com> Cc: Alex Elder <elder@kernel.org> Cc: Jens Axboe <axboe@kernel.dk> Acked-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c9fbe769d0
commit
7e9586bab2
1 changed files with 19 additions and 26 deletions
|
@ -428,14 +428,13 @@ static bool single_major = true;
|
|||
module_param(single_major, bool, 0444);
|
||||
MODULE_PARM_DESC(single_major, "Use a single major number for all rbd devices (default: true)");
|
||||
|
||||
static ssize_t rbd_add(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t rbd_remove(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t rbd_add_single_major(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t rbd_remove_single_major(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t add_store(struct bus_type *bus, const char *buf, size_t count);
|
||||
static ssize_t remove_store(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t add_single_major_store(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static ssize_t remove_single_major_store(struct bus_type *bus, const char *buf,
|
||||
size_t count);
|
||||
static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth);
|
||||
|
||||
static int rbd_dev_id_to_minor(int dev_id)
|
||||
|
@ -464,16 +463,16 @@ static bool rbd_is_lock_owner(struct rbd_device *rbd_dev)
|
|||
return is_lock_owner;
|
||||
}
|
||||
|
||||
static ssize_t rbd_supported_features_show(struct bus_type *bus, char *buf)
|
||||
static ssize_t supported_features_show(struct bus_type *bus, char *buf)
|
||||
{
|
||||
return sprintf(buf, "0x%llx\n", RBD_FEATURES_SUPPORTED);
|
||||
}
|
||||
|
||||
static BUS_ATTR(add, 0200, NULL, rbd_add);
|
||||
static BUS_ATTR(remove, 0200, NULL, rbd_remove);
|
||||
static BUS_ATTR(add_single_major, 0200, NULL, rbd_add_single_major);
|
||||
static BUS_ATTR(remove_single_major, 0200, NULL, rbd_remove_single_major);
|
||||
static BUS_ATTR(supported_features, 0444, rbd_supported_features_show, NULL);
|
||||
static BUS_ATTR_WO(add);
|
||||
static BUS_ATTR_WO(remove);
|
||||
static BUS_ATTR_WO(add_single_major);
|
||||
static BUS_ATTR_WO(remove_single_major);
|
||||
static BUS_ATTR_RO(supported_features);
|
||||
|
||||
static struct attribute *rbd_bus_attrs[] = {
|
||||
&bus_attr_add.attr,
|
||||
|
@ -5934,9 +5933,7 @@ static ssize_t do_rbd_add(struct bus_type *bus,
|
|||
goto out;
|
||||
}
|
||||
|
||||
static ssize_t rbd_add(struct bus_type *bus,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
static ssize_t add_store(struct bus_type *bus, const char *buf, size_t count)
|
||||
{
|
||||
if (single_major)
|
||||
return -EINVAL;
|
||||
|
@ -5944,9 +5941,8 @@ static ssize_t rbd_add(struct bus_type *bus,
|
|||
return do_rbd_add(bus, buf, count);
|
||||
}
|
||||
|
||||
static ssize_t rbd_add_single_major(struct bus_type *bus,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
static ssize_t add_single_major_store(struct bus_type *bus, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
return do_rbd_add(bus, buf, count);
|
||||
}
|
||||
|
@ -6049,9 +6045,7 @@ static ssize_t do_rbd_remove(struct bus_type *bus,
|
|||
return count;
|
||||
}
|
||||
|
||||
static ssize_t rbd_remove(struct bus_type *bus,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
static ssize_t remove_store(struct bus_type *bus, const char *buf, size_t count)
|
||||
{
|
||||
if (single_major)
|
||||
return -EINVAL;
|
||||
|
@ -6059,9 +6053,8 @@ static ssize_t rbd_remove(struct bus_type *bus,
|
|||
return do_rbd_remove(bus, buf, count);
|
||||
}
|
||||
|
||||
static ssize_t rbd_remove_single_major(struct bus_type *bus,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
static ssize_t remove_single_major_store(struct bus_type *bus, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
return do_rbd_remove(bus, buf, count);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue