mbox series

[PATCHv3,0/3] ext4/crypto: Move out crypto related ops to crypto.c

Message ID cover.1652595565.git.ritesh.list@gmail.com
Headers show
Series ext4/crypto: Move out crypto related ops to crypto.c | expand

Message

Ritesh Harjani (IBM) May 15, 2022, 6:37 a.m. UTC
Hello,

Please find the v3 of this cleanup series. Thanks to Eric for his quick
review of the patch series.

Description
=============
This is 1st in the series to cleanup ext4/super.c, since it has grown quite
large. This moves out crypto related ops and few fs encryption related
definitions to fs/ext4/crypto.c

I have tested "-g encrypt" xfstests group and don't see any surprises there.
The changes are relatively straight forward since it is just moving/refactoring.

Currently these patches apply cleanly on ext4 tree's dev branch.
Since in these series test_dummy_encryption related changes are dropped, hence
I don't think that this should give any major conflict with Eric's series.

NOTE: I noticed we could move both ext4 & f2fs to use uuid_t lib API from
include/linux/uuid.h for managing sb->s_encrypt_pw_salt.
That should kill custom implementations of uuid_is_zero()/uuid_is_nonzero().
But since I noticed it while writing this cover letter, so I would like to
do those changes in a seperate patch series if that is ok. That way maybe we
could cleanup tree wide changes in fs/ (if there are others too).


v2 -> v3
=========
1. Addressed review comments from Eric.

RFC -> v2
==========
1. Dropped all test_dummy_encryption related changes
   (Eric has separately submitted a v3 for fixing more general problems with
    that mount option).
2. Addressed Eric comments to:-
	1. rename ext4_crypto.c -> crypto.c
	2. Refactor out ext4_ioc_get_encryption_pwsalt() into crypto.c
3. Made ext4_fname_from_fscrypt_name() static since it is only being called
   from within crypto.c functions.

[v2] - https://lore.kernel.org/linux-ext4/cover.1652539361.git.ritesh.list@gmail.com/T/#t
[RFC] - https://lore.kernel.org/linux-ext4/cover.1650517532.git.ritesh.list@gmail.com/

Ritesh Harjani (3):
  ext4: Move ext4 crypto code to its own file crypto.c
  ext4: Cleanup function defs from ext4.h into crypto.c
  ext4: Refactor and move ext4_ioctl_get_encryption_pwsalt()

 fs/ext4/Makefile |   1 +
 fs/ext4/crypto.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ext4/ext4.h   |  76 +++------------
 fs/ext4/ioctl.c  |  59 +-----------
 fs/ext4/super.c  | 122 -----------------------
 5 files changed, 263 insertions(+), 241 deletions(-)
 create mode 100644 fs/ext4/crypto.c

--
2.31.1

Comments

Theodore Ts'o May 19, 2022, 2:08 a.m. UTC | #1
On Sun, 15 May 2022 12:07:45 +0530, Ritesh Harjani wrote:
> Please find the v3 of this cleanup series. Thanks to Eric for his quick
> review of the patch series.
> 
> Description
> =============
> This is 1st in the series to cleanup ext4/super.c, since it has grown quite
> large. This moves out crypto related ops and few fs encryption related
> definitions to fs/ext4/crypto.c
> 
> [...]

Applied, thanks!

[1/3] ext4: Move ext4 crypto code to its own file crypto.c
      commit: ebe541bdc293d4b2511bc4abb640dcddd454e54c
[2/3] ext4: Cleanup function defs from ext4.h into crypto.c
      commit: df56bae5a36f891021ea868657ab85f501d85176
[3/3] ext4: Refactor and move ext4_ioctl_get_encryption_pwsalt()
      commit: a137c5b48cb48b6c2885eeeec398433a435cf078

Best regards,