From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbcDCFXt (ORCPT ); Sun, 3 Apr 2016 01:23:49 -0400 Received: from mail-ig0-f195.google.com ([209.85.213.195]:35597 "EHLO mail-ig0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbcDCFXo (ORCPT ); Sun, 3 Apr 2016 01:23:44 -0400 From: Eric Biggers To: linux-fsdevel@vger.kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, jaegeuk@kernel.org, tytso@mit.edu, mhalcrow@google.com, Eric Biggers Subject: [PATCH 09/13] fscrypto: make fname_encrypt() actually return length of ciphertext Date: Sun, 3 Apr 2016 00:22:00 -0500 Message-Id: <1459660924-2960-10-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> References: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This makes the return value match the comment. Previously it would actually return 0 if encryption was successful. (No callers currently care.) Signed-off-by: Eric Biggers --- fs/crypto/fname.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index e5c6959..5b10b73 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -100,12 +100,13 @@ static int fname_encrypt(struct inode *inode, } kfree(alloc_buf); skcipher_request_free(req); - if (res < 0) + if (res < 0) { printk_ratelimited(KERN_ERR "%s: Error (error code %d)\n", __func__, res); - + return res; + } oname->len = ciphertext_len; - return res; + return ciphertext_len; } /* -- 2.7.4