From 6c4e66a8f2e7007ccb409a090ec7a70da6f6b4e0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Aug 2010 15:48:23 -0700
Subject: [PATCH] --- yaml --- r: 208853 b: refs/heads/master c:
 cbbfe499055f49c09210e04d9f88c2f483052384 h: refs/heads/master i:   208851:
 5f8df2de1a1a7ca6ca27d9590ec54c5db3072668 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ceph/ceph_fs.h | 2 ++
 trunk/fs/ceph/crypto.c  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a052fe38fce7..4d77e3abeea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73a7e693f9da464b0df07643af3f8ffc04dcc0b5
+refs/heads/master: cbbfe499055f49c09210e04d9f88c2f483052384
diff --git a/trunk/fs/ceph/ceph_fs.h b/trunk/fs/ceph/ceph_fs.h
index bf7dea673237..5bf4ec2cf9eb 100644
--- a/trunk/fs/ceph/ceph_fs.h
+++ b/trunk/fs/ceph/ceph_fs.h
@@ -74,6 +74,8 @@ int ceph_file_layout_is_valid(const struct ceph_file_layout *layout);
 #define CEPH_CRYPTO_NONE 0x0
 #define CEPH_CRYPTO_AES  0x1
 
+#define CEPH_AES_IV "cephsageyudagreg"
+
 /* security/authentication protocols */
 #define CEPH_AUTH_UNKNOWN	0x0
 #define CEPH_AUTH_NONE	 	0x1
diff --git a/trunk/fs/ceph/crypto.c b/trunk/fs/ceph/crypto.c
index c9318278f419..a3e627f63293 100644
--- a/trunk/fs/ceph/crypto.c
+++ b/trunk/fs/ceph/crypto.c
@@ -75,7 +75,7 @@ static struct crypto_blkcipher *ceph_crypto_alloc_cipher(void)
 	return crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
 }
 
-static const u8 *aes_iv = "cephsageyudagreg";
+static const u8 *aes_iv = (u8 *)CEPH_AES_IV;
 
 static int ceph_aes_encrypt(const void *key, int key_len,
 			    void *dst, size_t *dst_len,