Signed-off-by: Mariusz Kozlowski <[EMAIL PROTECTED]>
fs/reiser4/plugin/file/cryptcompress.c | 101386 -> 101352 (-34 bytes)
fs/reiser4/plugin/file/cryptcompress.o | 456784 -> 456644 (-140 bytes)
fs/reiser4/plugin/file/cryptcompress.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.23-rc1-mm1-a/fs/reiser4/plugin/file/cryptcompress.c
2007-07-26 13:07:46.000000000 +0200
+++ linux-2.6.23-rc1-mm1-b/fs/reiser4/plugin/file/cryptcompress.c
2007-07-31 15:00:24.000000000 +0200
@@ -74,13 +74,13 @@ static void set_inode_crypto_info (struc
/* allocate a cipher key info */
struct reiser4_crypto_info * reiser4_alloc_crypto_info (struct inode * inode)
{
- struct reiser4_crypto_info * info;
+ struct reiser4_crypto_info *info;
int fipsize;
- info = kmalloc(sizeof(*info), reiser4_ctx_gfp_mask_get());
+ info = kzalloc(sizeof(*info), reiser4_ctx_gfp_mask_get());
if (!info)
return ERR_PTR(-ENOMEM);
- memset(info, 0, sizeof (*info));
+
fipsize = inode_digest_plugin(inode)->fipsize;
info->keyid = kmalloc(fipsize, reiser4_ctx_gfp_mask_get());
if (!info->keyid) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
