summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a3fbe5d)
Make explicit that snapshot names don't change by making functions
return and take parameters that that point to const qualified data.
This resolves:
http://tracker.ceph.com/issues/4867
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
* Returns a dynamically-allocated snapshot name if successful, or a
* pointer-coded error otherwise.
*/
* Returns a dynamically-allocated snapshot name if successful, or a
* pointer-coded error otherwise.
*/
-static char *rbd_dev_v1_snap_info(struct rbd_device *rbd_dev, u32 which,
+static const char *rbd_dev_v1_snap_info(struct rbd_device *rbd_dev, u32 which,
u64 *snap_size, u64 *snap_features)
{
u64 *snap_size, u64 *snap_features)
{
int i;
rbd_assert(which < rbd_dev->header.snapc->num_snaps);
int i;
rbd_assert(which < rbd_dev->header.snapc->num_snaps);
-static char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which)
+static const char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which)
{
size_t size;
void *reply_buf;
{
size_t size;
void *reply_buf;
-static char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which,
+static const char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which,
u64 *snap_size, u64 *snap_features)
{
u64 snap_id;
u64 size;
u64 features;
u64 *snap_size, u64 *snap_features)
{
u64 snap_id;
u64 size;
u64 features;
int ret;
rbd_assert(which < rbd_dev->header.snapc->num_snaps);
int ret;
rbd_assert(which < rbd_dev->header.snapc->num_snaps);
-static char *rbd_dev_snap_info(struct rbd_device *rbd_dev, u32 which,
+static const char *rbd_dev_snap_info(struct rbd_device *rbd_dev, u32 which,
u64 *snap_size, u64 *snap_features)
{
if (rbd_dev->image_format == 1)
u64 *snap_size, u64 *snap_features)
{
if (rbd_dev->image_format == 1)
while (index < snap_count || links != head) {
u64 snap_id;
struct rbd_snap *snap;
while (index < snap_count || links != head) {
u64 snap_id;
struct rbd_snap *snap;
u64 snap_size = 0;
u64 snap_features = 0;
u64 snap_size = 0;
u64 snap_features = 0;