diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-27 17:40:18 +0200 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-27 23:57:28 +0200 |
| commit | 4295f2217a5aa8ef2738e3a368db3c1ceab41212 (patch) | |
| tree | 557b4efd8558bfa71bae87413d0f4d6f0ba0511a /include/linux/ceph/osd_client.h | |
| parent | 2d0ebc5d591f49131bf8f93b54c5424162c3fb7f (diff) | |
| download | blackbird-op-linux-4295f2217a5aa8ef2738e3a368db3c1ceab41212.tar.gz blackbird-op-linux-4295f2217a5aa8ef2738e3a368db3c1ceab41212.zip | |
libceph: introduce and start using oid abstraction
In preparation for tiering support, which would require having two
(base and target) object names for each osd request and also copying
those names around, introduce struct ceph_object_id (oid) and a couple
helpers to facilitate those copies and encapsulate the fact that object
name is not necessarily a NUL-terminated string.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include/linux/ceph/osd_client.h')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index b42f15848cae..8d8bb53994b1 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -12,12 +12,6 @@ #include <linux/ceph/auth.h> #include <linux/ceph/pagelist.h> -/* - * Maximum object name size - * (must be at least as big as RBD_MAX_MD_NAME_LEN -- currently 100) - */ -#define CEPH_MAX_OID_NAME_LEN 100 - struct ceph_msg; struct ceph_snap_context; struct ceph_osd_request; @@ -160,9 +154,8 @@ struct ceph_osd_request { void *r_priv; /* ditto */ struct ceph_object_locator r_oloc; + struct ceph_object_id r_oid; - char r_oid[CEPH_MAX_OID_NAME_LEN]; /* object name */ - int r_oid_len; u64 r_snapid; unsigned long r_stamp; /* send OR check time */ |
