From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbbETAoG (ORCPT ); Tue, 19 May 2015 20:44:06 -0400 Received: from mail.kernel.org ([198.145.29.136]:50705 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbbETAnn (ORCPT ); Tue, 19 May 2015 20:43:43 -0400 From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 4/4] f2fs crypto: assign GFP_KERNEL for f2fs_derive_key_aes Date: Tue, 19 May 2015 17:43:26 -0700 Message-Id: <1432082606-55975-4-git-send-email-jaegeuk@kernel.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1432082606-55975-1-git-send-email-jaegeuk@kernel.org> References: <1432082606-55975-1-git-send-email-jaegeuk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The f2fs_derive_key_aes is called not from data path, so we can use GFP_KERNEL. Signed-off-by: Jaegeuk Kim --- fs/f2fs/crypto_key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/crypto_key.c b/fs/f2fs/crypto_key.c index 2f5a45b..49f9e31 100644 --- a/fs/f2fs/crypto_key.c +++ b/fs/f2fs/crypto_key.c @@ -56,7 +56,7 @@ static int f2fs_derive_key_aes(char deriving_key[F2FS_AES_128_ECB_KEY_SIZE], goto out; } crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_REQ_WEAK_KEY); - req = ablkcipher_request_alloc(tfm, GFP_NOFS); + req = ablkcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { res = -ENOMEM; goto out; @@ -137,7 +137,7 @@ int _f2fs_get_encryption_info(struct inode *inode) return -EINVAL; res = 0; - crypt_info = kmem_cache_alloc(f2fs_crypt_info_cachep, GFP_NOFS); + crypt_info = kmem_cache_alloc(f2fs_crypt_info_cachep, GFP_KERNEL); if (!crypt_info) return -ENOMEM; -- 2.1.1