diff options
| author | Tommi Virtanen <tommi.virtanen@dreamhost.com> | 2011-03-25 16:32:57 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-03-29 12:11:16 -0700 |
| commit | 8323c3aa74cd92465350294567142d12ffdcc963 (patch) | |
| tree | 052e7374393994eea8d534f98ee1bc7acea4c2d9 /include/linux/ceph | |
| parent | fbdb9190482fd83a3eb20cdeb0da454759f479d7 (diff) | |
| download | kernel_samsung_tuna-8323c3aa74cd92465350294567142d12ffdcc963.zip kernel_samsung_tuna-8323c3aa74cd92465350294567142d12ffdcc963.tar.gz kernel_samsung_tuna-8323c3aa74cd92465350294567142d12ffdcc963.tar.bz2 | |
ceph: Move secret key parsing earlier.
This makes the base64 logic be contained in mount option parsing,
and prepares us for replacing the homebew key management with the
kernel key retention service.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/auth.h | 4 | ||||
| -rw-r--r-- | include/linux/ceph/libceph.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h index 7fff521..aa13392 100644 --- a/include/linux/ceph/auth.h +++ b/include/linux/ceph/auth.h @@ -67,12 +67,12 @@ struct ceph_auth_client { bool negotiating; /* true if negotiating protocol */ const char *name; /* entity name */ u64 global_id; /* our unique id in system */ - const char *secret; /* our secret key */ + const struct ceph_crypto_key *key; /* our secret key */ unsigned want_keys; /* which services we want */ }; extern struct ceph_auth_client *ceph_auth_init(const char *name, - const char *secret); + const struct ceph_crypto_key *key); extern void ceph_auth_destroy(struct ceph_auth_client *ac); extern void ceph_auth_reset(struct ceph_auth_client *ac); diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 0d2e0ff..6365f04 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h @@ -61,7 +61,7 @@ struct ceph_options { pointer type of args */ int num_mon; char *name; - char *secret; + struct ceph_crypto_key *key; }; /* |