Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[safe/jmp/linux-2.6] / fs / ceph / msgr.h

diff --git a/fs/ceph/msgr.h b/fs/ceph/msgr.h
index 6baa8e4..892a029 100644 (file)
--- a/fs/ceph/msgr.h
+++ b/fs/ceph/msgr.h
@@ -50,7 +50,6 @@ struct ceph_entity_name {
 #define CEPH_ENTITY_TYPE_MDS    0x02
 #define CEPH_ENTITY_TYPE_OSD    0x04
 #define CEPH_ENTITY_TYPE_CLIENT 0x08
-#define CEPH_ENTITY_TYPE_ADMIN  0x10
 #define CEPH_ENTITY_TYPE_AUTH   0x20
 
 #define CEPH_ENTITY_TYPE_ANY    0xFF