diff options
| author | Sage Weil <sage@newdream.net> | 2010-05-12 14:48:20 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-05-17 15:25:38 -0700 |
| commit | ca9d93a292e327bbcddd8f8ea4197397e35097d4 (patch) | |
| tree | 30e81e64079228bca30b4b32b5ad4df68eca6dc2 /fs/ceph/messenger.h | |
| parent | 1a75627896fe67d0124eab6fe2f83dd40188c40c (diff) | |
ceph: resync headers with userland
Notable changes include pool op defines and types, FLOCK feature bit, and
new CMPXATTR osd ops.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/messenger.h')
| -rw-r--r-- | fs/ceph/messenger.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h index e56564f7e71..4e5764c7fbc 100644 --- a/fs/ceph/messenger.h +++ b/fs/ceph/messenger.h @@ -49,10 +49,8 @@ struct ceph_connection_operations { int *skip); }; -extern const char *ceph_name_type_str(int t); - /* use format string %s%d */ -#define ENTITY_NAME(n) ceph_name_type_str((n).type), le64_to_cpu((n).num) +#define ENTITY_NAME(n) ceph_entity_type_name((n).type), le64_to_cpu((n).num) struct ceph_messenger { struct ceph_entity_inst inst; /* my name+address */ |