mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
rbd: drop rbd_dev parameter in snap functions
Both rbd_register_snap_dev() and __rbd_remove_snap_dev() have rbd_dev parameters that are unused. Remove them. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
parent
ed63f4fd9a
commit
14e7085d84
1 changed files with 7 additions and 12 deletions
|
@ -202,8 +202,7 @@ static ssize_t rbd_snap_add(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
const char *buf,
|
const char *buf,
|
||||||
size_t count);
|
size_t count);
|
||||||
static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
|
static void __rbd_remove_snap_dev(struct rbd_snap *snap);
|
||||||
struct rbd_snap *snap);
|
|
||||||
|
|
||||||
static ssize_t rbd_add(struct bus_type *bus, const char *buf,
|
static ssize_t rbd_add(struct bus_type *bus, const char *buf,
|
||||||
size_t count);
|
size_t count);
|
||||||
|
@ -1702,7 +1701,7 @@ static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev)
|
||||||
struct rbd_snap *next;
|
struct rbd_snap *next;
|
||||||
|
|
||||||
list_for_each_entry_safe(snap, next, &rbd_dev->snaps, node)
|
list_for_each_entry_safe(snap, next, &rbd_dev->snaps, node)
|
||||||
__rbd_remove_snap_dev(rbd_dev, snap);
|
__rbd_remove_snap_dev(snap);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -2010,15 +2009,13 @@ static struct device_type rbd_snap_device_type = {
|
||||||
.release = rbd_snap_dev_release,
|
.release = rbd_snap_dev_release,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
|
static void __rbd_remove_snap_dev(struct rbd_snap *snap)
|
||||||
struct rbd_snap *snap)
|
|
||||||
{
|
{
|
||||||
list_del(&snap->node);
|
list_del(&snap->node);
|
||||||
device_unregister(&snap->dev);
|
device_unregister(&snap->dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rbd_register_snap_dev(struct rbd_device *rbd_dev,
|
static int rbd_register_snap_dev(struct rbd_snap *snap,
|
||||||
struct rbd_snap *snap,
|
|
||||||
struct device *parent)
|
struct device *parent)
|
||||||
{
|
{
|
||||||
struct device *dev = &snap->dev;
|
struct device *dev = &snap->dev;
|
||||||
|
@ -2045,8 +2042,7 @@ static int __rbd_add_snap_dev(struct rbd_device *rbd_dev,
|
||||||
snap->size = rbd_dev->header.snap_sizes[i];
|
snap->size = rbd_dev->header.snap_sizes[i];
|
||||||
snap->id = rbd_dev->header.snapc->snaps[i];
|
snap->id = rbd_dev->header.snapc->snaps[i];
|
||||||
if (device_is_registered(&rbd_dev->dev)) {
|
if (device_is_registered(&rbd_dev->dev)) {
|
||||||
ret = rbd_register_snap_dev(rbd_dev, snap,
|
ret = rbd_register_snap_dev(snap, &rbd_dev->dev);
|
||||||
&rbd_dev->dev);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
@ -2111,7 +2107,7 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev)
|
||||||
*/
|
*/
|
||||||
if (rbd_dev->snap_id == old_snap->id)
|
if (rbd_dev->snap_id == old_snap->id)
|
||||||
rbd_dev->snap_exists = false;
|
rbd_dev->snap_exists = false;
|
||||||
__rbd_remove_snap_dev(rbd_dev, old_snap);
|
__rbd_remove_snap_dev(old_snap);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (old_snap->id == cur_id) {
|
if (old_snap->id == cur_id) {
|
||||||
|
@ -2175,8 +2171,7 @@ static int rbd_bus_add_dev(struct rbd_device *rbd_dev)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
list_for_each_entry(snap, &rbd_dev->snaps, node) {
|
list_for_each_entry(snap, &rbd_dev->snaps, node) {
|
||||||
ret = rbd_register_snap_dev(rbd_dev, snap,
|
ret = rbd_register_snap_dev(snap, &rbd_dev->dev);
|
||||||
&rbd_dev->dev);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue