diff options
| author | Tommi Virtanen <tommi.virtanen@dreamhost.com> | 2011-03-26 02:32:57 +0300 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-03-29 23:11:16 +0400 |
| commit | 8323c3aa74cd92465350294567142d12ffdcc963 (patch) | |
| tree | 052e7374393994eea8d534f98ee1bc7acea4c2d9 /net/ceph/mon_client.c | |
| parent | fbdb9190482fd83a3eb20cdeb0da454759f479d7 (diff) | |
| download | linux-8323c3aa74cd92465350294567142d12ffdcc963.tar.xz | |
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 'net/ceph/mon_client.c')
| -rw-r--r-- | net/ceph/mon_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 8a079399174a..cbe31fa45508 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -759,7 +759,7 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) /* authentication */ monc->auth = ceph_auth_init(cl->options->name, - cl->options->secret); + cl->options->key); if (IS_ERR(monc->auth)) return PTR_ERR(monc->auth); monc->auth->want_keys = |