Skip to content

Commit

Permalink
Swap arguments of get_snap_id
Browse files Browse the repository at this point in the history
  • Loading branch information
@VictorDenisov
VictorDenisov committed Jan 21, 2017
1 parent 2998e6c commit 3f0b60e
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/librbd/DiffIterate.cc
View file
Expand Up @@ -216,7 +216,7 @@ int DiffIterate::execute() {
RWLock::RLocker snap_locker(m_image_ctx.snap_lock);
head_ctx.dup(m_image_ctx.data_ctx);
if (m_from_snap_name) {
from_snap_id = m_image_ctx.get_snap_id(m_from_snap_namespace, m_from_snap_name);
from_snap_id = m_image_ctx.get_snap_id(m_from_snap_name, m_from_snap_namespace);
from_size = m_image_ctx.get_image_size(from_snap_id);
}
end_snap_id = m_image_ctx.snap_id;
Expand Down
6 changes: 3 additions & 3 deletions src/librbd/ImageCtx.cc
View file
Expand Up @@ -409,7 +409,7 @@ struct C_InvalidateCache : public Context {
string in_snap_name)
{
assert(snap_lock.is_wlocked());
snap_t in_snap_id = get_snap_id(in_snap_namespace, in_snap_name);
snap_t in_snap_id = get_snap_id(in_snap_name, in_snap_namespace);
if (in_snap_id != CEPH_NOSNAP) {
snap_id = in_snap_id;
snap_name = in_snap_name;
Expand All @@ -430,8 +430,8 @@ struct C_InvalidateCache : public Context {
data_ctx.snap_set_read(snap_id);
}

snap_t ImageCtx::get_snap_id(cls::rbd::SnapshotNamespace in_snap_namespace,
string in_snap_name) const
snap_t ImageCtx::get_snap_id(string in_snap_name,
cls::rbd::SnapshotNamespace in_snap_namespace) const
{
assert(snap_lock.is_locked());
auto it = snap_ids.find({in_snap_namespace, in_snap_name});
Expand Down
4 changes: 2 additions & 2 deletions src/librbd/ImageCtx.h
View file
Expand Up @@ -229,8 +229,8 @@ namespace librbd {
int snap_set(cls::rbd::SnapshotNamespace in_snap_namespace,
std::string in_snap_name);
void snap_unset();
librados::snap_t get_snap_id(cls::rbd::SnapshotNamespace in_snap_namespace,
std::string in_snap_name) const;
librados::snap_t get_snap_id(std::string in_snap_name,
cls::rbd::SnapshotNamespace in_snap_namespace) const;
const SnapInfo* get_snap_info(librados::snap_t in_snap_id) const;
int get_snap_name(librados::snap_t in_snap_id,
std::string *out_snap_name) const;
Expand Down
26 changes: 13 additions & 13 deletions src/librbd/Operations.cc
View file
Expand Up @@ -698,7 +698,7 @@ void Operations<I>::snap_create(const char *snap_name,
}

m_image_ctx.snap_lock.get_read();
if (m_image_ctx.get_snap_id(snap_namespace, snap_name) != CEPH_NOSNAP) {
if (m_image_ctx.get_snap_id(snap_name, snap_namespace) != CEPH_NOSNAP) {
m_image_ctx.snap_lock.put_read();
on_finish->complete(-EEXIST);
return;
Expand Down Expand Up @@ -730,7 +730,7 @@ void Operations<I>::execute_snap_create(const std::string &snap_name,
<< dendl;

m_image_ctx.snap_lock.get_read();
if (m_image_ctx.get_snap_id(snap_namespace, snap_name) != CEPH_NOSNAP) {
if (m_image_ctx.get_snap_id(snap_name, snap_namespace) != CEPH_NOSNAP) {
m_image_ctx.snap_lock.put_read();
on_finish->complete(-EEXIST);
return;
Expand Down Expand Up @@ -768,7 +768,7 @@ int Operations<I>::snap_rollback(const char *snap_name,
return -EROFS;
}

uint64_t snap_id = m_image_ctx.get_snap_id(snap_namespace, snap_name);
uint64_t snap_id = m_image_ctx.get_snap_id(snap_name, snap_namespace);
if (snap_id == CEPH_NOSNAP) {
lderr(cct) << "No such snapshot found." << dendl;
return -ENOENT;
Expand Down Expand Up @@ -806,7 +806,7 @@ void Operations<I>::execute_snap_rollback(const std::string &snap_name,
<< dendl;

m_image_ctx.snap_lock.get_read();
uint64_t snap_id = m_image_ctx.get_snap_id(snap_namespace, snap_name);
uint64_t snap_id = m_image_ctx.get_snap_id(snap_name, snap_namespace);
if (snap_id == CEPH_NOSNAP) {
lderr(cct) << "No such snapshot found." << dendl;
m_image_ctx.snap_lock.put_read();
Expand Down Expand Up @@ -864,7 +864,7 @@ void Operations<I>::snap_remove(const char *snap_name,

// quickly filter out duplicate ops
m_image_ctx.snap_lock.get_read();
if (m_image_ctx.get_snap_id(snap_namespace, snap_name) == CEPH_NOSNAP) {
if (m_image_ctx.get_snap_id(snap_name, snap_namespace) == CEPH_NOSNAP) {
m_image_ctx.snap_lock.put_read();
on_finish->complete(-ENOENT);
return;
Expand Down Expand Up @@ -905,7 +905,7 @@ void Operations<I>::execute_snap_remove(const std::string &snap_name,
<< dendl;

m_image_ctx.snap_lock.get_read();
uint64_t snap_id = m_image_ctx.get_snap_id(snap_namespace, snap_name);
uint64_t snap_id = m_image_ctx.get_snap_id(snap_name, snap_namespace);
if (snap_id == CEPH_NOSNAP) {
lderr(m_image_ctx.cct) << "No such snapshot found." << dendl;
m_image_ctx.snap_lock.put_read();
Expand Down Expand Up @@ -952,11 +952,11 @@ int Operations<I>::snap_rename(const char *srcname, const char *dstname) {

{
RWLock::RLocker l(m_image_ctx.snap_lock);
snap_id = m_image_ctx.get_snap_id(cls::rbd::UserSnapshotNamespace(), srcname);
snap_id = m_image_ctx.get_snap_id(srcname, cls::rbd::UserSnapshotNamespace());
if (snap_id == CEPH_NOSNAP) {
return -ENOENT;
}
if (m_image_ctx.get_snap_id(cls::rbd::UserSnapshotNamespace(), dstname) != CEPH_NOSNAP) {
if (m_image_ctx.get_snap_id(dstname, cls::rbd::UserSnapshotNamespace()) != CEPH_NOSNAP) {
return -EEXIST;
}
}
Expand Down Expand Up @@ -997,7 +997,7 @@ void Operations<I>::execute_snap_rename(const uint64_t src_snap_id,
}

m_image_ctx.snap_lock.get_read();
if (m_image_ctx.get_snap_id(cls::rbd::UserSnapshotNamespace(), dest_snap_name) != CEPH_NOSNAP) { // Renaming is supported for snapshots from user namespace only.
if (m_image_ctx.get_snap_id(dest_snap_name, cls::rbd::UserSnapshotNamespace()) != CEPH_NOSNAP) { // Renaming is supported for snapshots from user namespace only.
m_image_ctx.snap_lock.put_read();
on_finish->complete(-EEXIST);
return;
Expand Down Expand Up @@ -1039,7 +1039,7 @@ int Operations<I>::snap_protect(const char *snap_name, const cls::rbd::SnapshotN
{
RWLock::RLocker snap_locker(m_image_ctx.snap_lock);
bool is_protected;
r = m_image_ctx.is_snap_protected(m_image_ctx.get_snap_id(snap_namespace, snap_name),
r = m_image_ctx.is_snap_protected(m_image_ctx.get_snap_id(snap_name, snap_namespace),
&is_protected);
if (r < 0) {
return r;
Expand Down Expand Up @@ -1085,7 +1085,7 @@ void Operations<I>::execute_snap_protect(const std::string &snap_name,

m_image_ctx.snap_lock.get_read();
bool is_protected;
int r = m_image_ctx.is_snap_protected(m_image_ctx.get_snap_id(snap_namespace, snap_name),
int r = m_image_ctx.is_snap_protected(m_image_ctx.get_snap_id(snap_name, snap_namespace),
&is_protected);
if (r < 0) {
m_image_ctx.snap_lock.put_read();
Expand Down Expand Up @@ -1127,7 +1127,7 @@ int Operations<I>::snap_unprotect(const char *snap_name,
{
RWLock::RLocker snap_locker(m_image_ctx.snap_lock);
bool is_unprotected;
r = m_image_ctx.is_snap_unprotected(m_image_ctx.get_snap_id(snap_namespace, snap_name),
r = m_image_ctx.is_snap_unprotected(m_image_ctx.get_snap_id(snap_name, snap_namespace),
&is_unprotected);
if (r < 0) {
return r;
Expand Down Expand Up @@ -1173,7 +1173,7 @@ void Operations<I>::execute_snap_unprotect(const std::string &snap_name,

m_image_ctx.snap_lock.get_read();
bool is_unprotected;
int r = m_image_ctx.is_snap_unprotected(m_image_ctx.get_snap_id(snap_namespace, snap_name),
int r = m_image_ctx.is_snap_unprotected(m_image_ctx.get_snap_id(snap_name, snap_namespace),
&is_unprotected);
if (r < 0) {
m_image_ctx.snap_lock.put_read();
Expand Down
2 changes: 1 addition & 1 deletion src/librbd/image/RefreshRequest.cc
View file
Expand Up @@ -1008,7 +1008,7 @@ void RefreshRequest<I>::apply() {
m_image_ctx.snapc = m_snapc;

if (m_image_ctx.snap_id != CEPH_NOSNAP &&
m_image_ctx.get_snap_id(m_image_ctx.snap_namespace, m_image_ctx.snap_name) != m_image_ctx.snap_id) {
m_image_ctx.get_snap_id(m_image_ctx.snap_name, m_image_ctx.snap_namespace) != m_image_ctx.snap_id) {
lderr(cct) << "tried to read from a snapshot that no longer exists: "
<< m_image_ctx.snap_name << dendl;
m_image_ctx.snap_exists = false;
Expand Down
2 changes: 1 addition & 1 deletion src/librbd/image/SetSnapRequest.cc
View file
Expand Up @@ -122,7 +122,7 @@ Context *SetSnapRequest<I>::handle_block_writes(int *result) {

{
RWLock::RLocker snap_locker(m_image_ctx.snap_lock);
m_snap_id = m_image_ctx.get_snap_id(m_snap_namespace, m_snap_name);
m_snap_id = m_image_ctx.get_snap_id(m_snap_name, m_snap_namespace);
if (m_snap_id == CEPH_NOSNAP) {
ldout(cct, 5) << "failed to locate snapshot '" << m_snap_name << "'"
<< dendl;
Expand Down
6 changes: 3 additions & 3 deletions src/librbd/internal.cc
View file
Expand Up @@ -683,7 +683,7 @@ void filter_out_mirror_watchers(ImageCtx *ictx,
ldout(cct, 20) << "children flatten " << ictx->name << dendl;

RWLock::RLocker l(ictx->snap_lock);
snap_t snap_id = ictx->get_snap_id(cls::rbd::UserSnapshotNamespace(), snap_name);
snap_t snap_id = ictx->get_snap_id(snap_name, cls::rbd::UserSnapshotNamespace());
parent_spec parent_spec(ictx->md_ctx.get_id(), ictx->id, snap_id);
map< pair<int64_t, string>, set<string> > image_info;

Expand Down Expand Up @@ -862,7 +862,7 @@ void filter_out_mirror_watchers(ImageCtx *ictx,
return r;

RWLock::RLocker l(ictx->snap_lock);
snap_t snap_id = ictx->get_snap_id(cls::rbd::UserSnapshotNamespace(), snap_name);
snap_t snap_id = ictx->get_snap_id(snap_name, cls::rbd::UserSnapshotNamespace());
if (snap_id == CEPH_NOSNAP)
return -ENOENT;
bool is_unprotected;
Expand Down Expand Up @@ -1832,7 +1832,7 @@ void filter_out_mirror_watchers(ImageCtx *ictx,
return r;

RWLock::RLocker l(ictx->snap_lock);
*exists = ictx->get_snap_id(snap_namespace, snap_name) != CEPH_NOSNAP;
*exists = ictx->get_snap_id(snap_name, snap_namespace) != CEPH_NOSNAP;
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/librbd/operation/SnapshotProtectRequest.cc
View file
Expand Up @@ -86,7 +86,7 @@ int SnapshotProtectRequest<I>::verify_and_send_protect_snap() {
return -ENOSYS;
}

uint64_t snap_id = image_ctx.get_snap_id(m_snap_namespace, m_snap_name);
uint64_t snap_id = image_ctx.get_snap_id(m_snap_name, m_snap_namespace);
if (snap_id == CEPH_NOSNAP) {
return -ENOENT;
}
Expand Down
2 changes: 1 addition & 1 deletion src/librbd/operation/SnapshotUnprotectRequest.cc
View file
Expand Up @@ -320,7 +320,7 @@ int SnapshotUnprotectRequest<I>::verify_and_send_unprotect_snap_start() {
return -ENOSYS;
}

m_snap_id = image_ctx.get_snap_id(m_snap_namespace, m_snap_name);
m_snap_id = image_ctx.get_snap_id(m_snap_name, m_snap_namespace);
if (m_snap_id == CEPH_NOSNAP) {
return -ENOENT;
}
Expand Down

0 comments on commit 3f0b60e

Please sign in to comment.