summaryrefslogtreecommitdiffstats
path: root/include/linux/ceph/libceph.h
diff options
context:
space:
mode:
authorTommi Virtanen2011-03-26 00:32:57 +0100
committerSage Weil2011-03-29 21:11:16 +0200
commit8323c3aa74cd92465350294567142d12ffdcc963 (patch)
tree052e7374393994eea8d534f98ee1bc7acea4c2d9 /include/linux/ceph/libceph.h
parentlibceph: fix null dereference when unregistering linger requests (diff)
downloadkernel-qcow2-linux-8323c3aa74cd92465350294567142d12ffdcc963.tar.gz
kernel-qcow2-linux-8323c3aa74cd92465350294567142d12ffdcc963.tar.xz
kernel-qcow2-linux-8323c3aa74cd92465350294567142d12ffdcc963.zip
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/libceph.h')
-rw-r--r--include/linux/ceph/libceph.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 0d2e0fffb470..6365f041745b 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;
};
/*