Merge osd_id.h into object_id.h

This commit is contained in:
Vitaliy Filippov
2026-03-02 01:46:17 +03:00
parent a8dd8bf06c
commit 93cf69f89f
8 changed files with 25 additions and 36 deletions
-30
View File
@@ -1,30 +0,0 @@
// Copyright (c) Vitaliy Filippov, 2019+
// License: VNPL-1.1 or GNU GPL-2.0+ (see README.md for details)
#pragma once
#include "object_id.h"
typedef uint64_t osd_num_t;
typedef uint32_t pg_num_t;
struct pool_pg_num_t
{
pool_id_t pool_id;
pg_num_t pg_num;
};
inline bool operator < (const pool_pg_num_t & a, const pool_pg_num_t & b)
{
return a.pool_id < b.pool_id || a.pool_id == b.pool_id && a.pg_num < b.pg_num;
}
inline bool operator == (const pool_pg_num_t & a, const pool_pg_num_t & b)
{
return a.pool_id == b.pool_id && a.pg_num == b.pg_num;
}
inline bool operator != (const pool_pg_num_t & a, const pool_pg_num_t & b)
{
return a.pool_id != b.pool_id || a.pg_num != b.pg_num;
}
-1
View File
@@ -6,7 +6,6 @@
#include <stdint.h>
#include <vector>
#include "object_id.h"
#include "osd_id.h"
struct buf_len_t
{