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 02/15] fscrypt: clean up after fscrypt_prepare_lookup() conversions
Date: Mon, 30 Apr 2018 15:51:36 -0700 [thread overview]
Message-ID: <20180430225149.183514-3-ebiggers3@gmail.com> (raw)
In-Reply-To: <20180430225149.183514-1-ebiggers3@gmail.com>
From: Eric Biggers <ebiggers@google.com>
Now that all filesystems have been converted to use
fscrypt_prepare_lookup(), we can remove the fscrypt_set_d_op() and
fscrypt_set_encrypted_dentry() functions as well as un-export
fscrypt_d_ops.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
fs/crypto/crypto.c | 1 -
fs/crypto/fscrypt_private.h | 1 +
include/linux/fscrypt_notsupp.h | 10 ----------
include/linux/fscrypt_supp.h | 14 --------------
4 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index ce654526c0fb..f2b2d8408a01 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -353,7 +353,6 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
const struct dentry_operations fscrypt_d_ops = {
.d_revalidate = fscrypt_d_revalidate,
};
-EXPORT_SYMBOL(fscrypt_d_ops);
void fscrypt_restore_control_page(struct page *page)
{
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
index ad6722bae8b7..fb96e493167b 100644
--- a/fs/crypto/fscrypt_private.h
+++ b/fs/crypto/fscrypt_private.h
@@ -106,6 +106,7 @@ extern int fscrypt_do_page_crypto(const struct inode *inode,
gfp_t gfp_flags);
extern struct page *fscrypt_alloc_bounce_page(struct fscrypt_ctx *ctx,
gfp_t gfp_flags);
+extern const struct dentry_operations fscrypt_d_ops;
/* fname.c */
extern int fname_encrypt(struct inode *inode, const struct qstr *iname,
diff --git a/include/linux/fscrypt_notsupp.h b/include/linux/fscrypt_notsupp.h
index 44b50c04bae9..25b6492de6e5 100644
--- a/include/linux/fscrypt_notsupp.h
+++ b/include/linux/fscrypt_notsupp.h
@@ -64,16 +64,6 @@ static inline void fscrypt_restore_control_page(struct page *page)
return;
}
-static inline void fscrypt_set_d_op(struct dentry *dentry)
-{
- return;
-}
-
-static inline void fscrypt_set_encrypted_dentry(struct dentry *dentry)
-{
- return;
-}
-
/* policy.c */
static inline int fscrypt_ioctl_set_policy(struct file *filp,
const void __user *arg)
diff --git a/include/linux/fscrypt_supp.h b/include/linux/fscrypt_supp.h
index 477a7a6504d2..c9c2cc26bc62 100644
--- a/include/linux/fscrypt_supp.h
+++ b/include/linux/fscrypt_supp.h
@@ -74,20 +74,6 @@ static inline struct page *fscrypt_control_page(struct page *page)
extern void fscrypt_restore_control_page(struct page *);
-extern const struct dentry_operations fscrypt_d_ops;
-
-static inline void fscrypt_set_d_op(struct dentry *dentry)
-{
- d_set_d_op(dentry, &fscrypt_d_ops);
-}
-
-static inline void fscrypt_set_encrypted_dentry(struct dentry *dentry)
-{
- spin_lock(&dentry->d_lock);
- dentry->d_flags |= DCACHE_ENCRYPTED_WITH_KEY;
- spin_unlock(&dentry->d_lock);
-}
-
/* policy.c */
extern int fscrypt_ioctl_set_policy(struct file *, const void __user *);
extern int fscrypt_ioctl_get_policy(struct file *, void __user *);
--
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
next prev 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 ` Eric Biggers [this message]
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 ` [PATCH 07/15] fscrypt: don't special-case EOPNOTSUPP from fscrypt_get_encryption_info() Eric Biggers
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-3-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).