linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers3@gmail.com>
To: linux-fscrypt@vger.kernel.org, "Theodore Y . Ts'o" <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>,
	linux-ext4@vger.kernel.org, linux-mtd@lists.infradead.org,
	Eric Biggers <ebiggers@google.com>,
	linux-f2fs-devel@lists.sourceforge.net
Subject: [PATCH 07/15] fscrypt: don't special-case EOPNOTSUPP from fscrypt_get_encryption_info()
Date: Mon, 30 Apr 2018 15:51:41 -0700	[thread overview]
Message-ID: <20180430225149.183514-8-ebiggers3@gmail.com> (raw)
In-Reply-To: <20180430225149.183514-1-ebiggers3@gmail.com>

From: Eric Biggers <ebiggers@google.com>

In fscrypt_setup_filename(), remove the unnecessary check for
fscrypt_get_encryption_info() returning EOPNOTSUPP.  There's no reason
to handle this error differently from any other.  I think there may have
been some confusion because the "notsupp" version of
fscrypt_get_encryption_info() returns EOPNOTSUPP -- but that's not
applicable from inside fs/crypto/.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/crypto/fname.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 3b5164b159cb..8088a606c0aa 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -335,7 +335,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,
 		return 0;
 	}
 	ret = fscrypt_get_encryption_info(dir);
-	if (ret && ret != -EOPNOTSUPP)
+	if (ret)
 		return ret;
 
 	if (dir->i_crypt_info) {
-- 
2.17.0.441.gb46fe60e1d-goog


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

  parent reply	other threads:[~2018-04-30 22:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-30 22:51 [PATCH v2 00/15] fscrypt: improved logging and other cleanups Eric Biggers
2018-04-30 22:51 ` [PATCH 01/15] fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabled Eric Biggers
2018-04-30 22:51 ` [PATCH 02/15] fscrypt: clean up after fscrypt_prepare_lookup() conversions Eric Biggers
2018-04-30 22:51 ` [PATCH 03/15] fscrypt: remove unnecessary NULL check when allocating skcipher Eric Biggers
2018-04-30 22:51 ` [PATCH 04/15] fscrypt: remove error messages for skcipher_request_alloc() failure Eric Biggers
2018-04-30 22:51 ` [PATCH 05/15] fscrypt: remove stale comment from fscrypt_d_revalidate() Eric Biggers
2018-04-30 22:51 ` [PATCH 06/15] fscrypt: don't clear flags on crypto transform Eric Biggers
2018-04-30 22:51 ` Eric Biggers [this message]
2018-04-30 22:51 ` [PATCH 08/15] fscrypt: drop max_namelen check from fname_decrypt() Eric Biggers
2018-04-30 22:51 ` [PATCH 09/15] fscrypt: drop empty name " Eric Biggers
2018-04-30 22:51 ` [PATCH 10/15] fscrypt: make fscrypt_operations.max_namelen an integer Eric Biggers
2018-04-30 22:51 ` [PATCH 11/15] fscrypt: remove unnecessary check for non-logon key type Eric Biggers
2018-04-30 22:51 ` [PATCH 12/15] fscrypt: remove internal key size constants Eric Biggers
2018-04-30 22:51 ` [PATCH 13/15] fscrypt: use a common logging function Eric Biggers
2018-04-30 22:51 ` [PATCH 14/15] fscrypt: separate key lookup from key derivation Eric Biggers
2018-04-30 22:51 ` [PATCH 15/15] fscrypt: only derive the needed portion of the key Eric Biggers
2018-05-21  0:55 ` [PATCH v2 00/15] fscrypt: improved logging and other cleanups Theodore Y. Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180430225149.183514-8-ebiggers3@gmail.com \
    --to=ebiggers3@gmail.com \
    --cc=ebiggers@google.com \
    --cc=jaegeuk@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fscrypt@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).