From patchwork Tue Apr 4 21:30:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 746965 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vyMc032Yhz9s8B for ; Wed, 5 Apr 2017 07:31:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TtcuRjb1"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752997AbdDDVa4 (ORCPT ); Tue, 4 Apr 2017 17:30:56 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35921 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752798AbdDDVaz (ORCPT ); Tue, 4 Apr 2017 17:30:55 -0400 Received: by mail-pg0-f66.google.com with SMTP id 81so39758277pgh.3 for ; Tue, 04 Apr 2017 14:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0x203bamm0BOhLGi1ZhepxPJroD9f1LW3BTvi7O1dEQ=; b=TtcuRjb1DscSvkRKxBzzplDWBccgh89bE+exzygX2mNd9iXV/+sfo3jeqFjp6LmZqg eZo728XKdHvjn/cjpFOtKaCk4VNQSCp0scQlqZtkNLsGBhB/1cmk+kCkvQeb7Sx59A18 Q9ef7O9/AHgg6+f+pAjXHq44S0LEZYFfKCujkdQMFe4oCBRMRH4vDOqvHyCWvId/2O1O OVjmV8kRQIL7HDSGCM96Er6gMFBvb2EZ7zRCWQH4kOB3Uc9vsKehcOsRI5lrWS9VdEig hhNhuKpy5PDIMOK63Ro1zWkxWqyHhc6mt50LROnVWQgDtkqo/XdIg2eL0nuJyCFYOJfV dgUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0x203bamm0BOhLGi1ZhepxPJroD9f1LW3BTvi7O1dEQ=; b=Bh/9NhvSJ7/07vHET7+qZg8LMT62XHsxOgST3IRTEo17AXmAgcNb1Dq9omtdlyMSCI L4kyoKNm5Z4j8bzpq43Wn592WwLq4wK6D2uZKPu2Gn+sbAX3B4OKh+I0IntK8bkSdHIW EzWJWhjRwatf2Hq92+MUjxzcydgAYKdnqPt+3pkQAlK6WbTgUEnttcCEqhlGTpKThGbU WSOss/xAw/aOwx95UUHA9UCjupj165krPRtAbE7kl8SJ4SIbdV9vVrFowYwNVhfmOc2k /aoU2tgzHQOxvZtO4PbD96qi8pyiyydXYq0otDO+FYO4gpzIbp8bLZq8tdSChs96cYY2 oURQ== X-Gm-Message-State: AFeK/H2aHfKpcCTvvKIG/FLi0CroIGOuBy6j3MG71+a+zMr1K+SPxSUw4zL14hOZNxwSQA== X-Received: by 10.84.171.195 with SMTP id l61mr14340855plb.75.1491341454803; Tue, 04 Apr 2017 14:30:54 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id q73sm33481528pfl.37.2017.04.04.14.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Apr 2017 14:30:54 -0700 (PDT) From: Eric Biggers To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , Andreas Dilger , Eric Biggers Subject: [PATCH] ext4: trim return value and 'dir' argument from ext4_insert_dentry() Date: Tue, 4 Apr 2017 14:30:11 -0700 Message-Id: <20170404213011.108267-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers In the initial implementation of ext4 encryption, the filename was encrypted in ext4_insert_dentry(), which could fail and also required access to the 'dir' inode. Since then ext4 filename encryption has been changed to encrypt the filename earlier, so we can revert the additions to ext4_insert_dentry(). Signed-off-by: Eric Biggers --- fs/ext4/ext4.h | 9 ++++----- fs/ext4/inline.c | 2 +- fs/ext4/namei.c | 17 ++++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f493af666591..d55a244b26a7 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2356,11 +2356,10 @@ extern int ext4_find_dest_de(struct inode *dir, struct inode *inode, void *buf, int buf_size, struct ext4_filename *fname, struct ext4_dir_entry_2 **dest_de); -int ext4_insert_dentry(struct inode *dir, - struct inode *inode, - struct ext4_dir_entry_2 *de, - int buf_size, - struct ext4_filename *fname); +void ext4_insert_dentry(struct inode *inode, + struct ext4_dir_entry_2 *de, + int buf_size, + struct ext4_filename *fname); static inline void ext4_update_dx_flag(struct inode *inode) { if (!ext4_has_feature_dir_index(inode->i_sb)) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 375fb1c05d49..d5dea4c293ef 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1034,7 +1034,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, err = ext4_journal_get_write_access(handle, iloc->bh); if (err) return err; - ext4_insert_dentry(dir, inode, de, inline_size, fname); + ext4_insert_dentry(inode, de, inline_size, fname); ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size); diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 6ad612c576fc..70441cdee5cc 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1869,11 +1869,10 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode, return res; } -int ext4_insert_dentry(struct inode *dir, - struct inode *inode, - struct ext4_dir_entry_2 *de, - int buf_size, - struct ext4_filename *fname) +void ext4_insert_dentry(struct inode *inode, + struct ext4_dir_entry_2 *de, + int buf_size, + struct ext4_filename *fname) { int nlen, rlen; @@ -1892,7 +1891,6 @@ int ext4_insert_dentry(struct inode *dir, ext4_set_de_type(inode->i_sb, de, inode->i_mode); de->name_len = fname_len(fname); memcpy(de->name, fname_name(fname), fname_len(fname)); - return 0; } /* @@ -1928,11 +1926,8 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname, return err; } - /* By now the buffer is marked for journaling. Due to crypto operations, - * the following function call may fail */ - err = ext4_insert_dentry(dir, inode, de, blocksize, fname); - if (err < 0) - return err; + /* By now the buffer is marked for journaling */ + ext4_insert_dentry(inode, de, blocksize, fname); /* * XXX shouldn't update any times until successful