diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 20:46:09 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 20:46:09 +0400 |
| commit | 50f3515828024582402044bcced6804c070c491c (patch) | |
| tree | f9cf25bee56d0ca54acf4d571536268774dc56ed /net/ceph/mon_client.c | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
| parent | 4b2a58abd1e17c0ee53c8dded879e015917cca67 (diff) | |
| download | linux-50f3515828024582402044bcced6804c070c491c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: Create a new key type "ceph".
libceph: Get secret from the kernel keys api when mounting with key=NAME.
ceph: Move secret key parsing earlier.
libceph: fix null dereference when unregistering linger requests
ceph: unlock on error in ceph_osdc_start_request()
ceph: fix possible NULL pointer dereference
ceph: flush msgr_wq during mds_client shutdown
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 = |