Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6162e4b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates from Ted Ts'o:
 "A few bug fixes and add support for file-system level encryption in
  ext4"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
  ext4 crypto: enable encryption feature flag
  ext4 crypto: add symlink encryption
  ext4 crypto: enable filename encryption
  ext4 crypto: filename encryption modifications
  ext4 crypto: partial update to namei.c for fname crypto
  ext4 crypto: insert encrypted filenames into a leaf directory block
  ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames
  ext4 crypto: filename encryption facilities
  ext4 crypto: implement the ext4 decryption read path
  ext4 crypto: implement the ext4 encryption write path
  ext4 crypto: inherit encryption policies on inode and directory create
  ext4 crypto: enforce context consistency
  ext4 crypto: add encryption key management facilities
  ext4 crypto: add ext4 encryption facilities
  ext4 crypto: add encryption policy and password salt support
  ext4 crypto: add encryption xattr support
  ext4 crypto: export ext4_empty_dir()
  ext4 crypto: add ext4 encryption Kconfig
  ext4 crypto: reserve codepoints used by the ext4 encryption feature
  ext4 crypto: add ext4_mpage_readpages()
  ...
parents 17974c05 6ddb2447

fs/ext4/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -64,6 +64,23 @@ config EXT4_FS_SECURITY 
	  If you are not using a security module that requires using

	  extended attributes for file security labels, say N.



config EXT4_FS_ENCRYPTION

	bool "Ext4 Encryption"

	depends on EXT4_FS

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_XTS

	select CRYPTO_CTS

	select CRYPTO_SHA256

	select KEYS

	select ENCRYPTED_KEYS

	help

	  Enable encryption of ext4 files and directories.  This

	  feature is similar to ecryptfs, but it is more memory

	  efficient since it avoids caching the encrypted and

	  decrypted pages in the page cache.



config EXT4_DEBUG

	bool "EXT4 debugging support"

	depends on EXT4_FS

fs/ext4/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \ 
		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o \

		mmp.o indirect.o extents_status.o xattr.o xattr_user.o \

		xattr_trusted.o inline.o

		xattr_trusted.o inline.o readpage.o



ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_SECURITY)		+= xattr_security.o

ext4-$(CONFIG_EXT4_FS_ENCRYPTION)	+= crypto_policy.o crypto.o \

		crypto_key.o crypto_fname.o

fs/ext4/acl.c

+0 −5
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ 
 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>

 */



#include <linux/init.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/capability.h>

#include <linux/fs.h>

#include "ext4_jbd2.h"

#include "ext4.h"

#include "xattr.h"

fs/ext4/balloc.c

+0 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/time.h>

#include <linux/capability.h>

#include <linux/fs.h>

#include <linux/jbd2.h>

#include <linux/quotaops.h>

#include <linux/buffer_head.h>

#include "ext4.h"
@@ -641,8 +640,6 @@ ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, 
	 * fail EDQUOT for metdata, but we do account for it.

	 */

	if (!(*errp) && (flags & EXT4_MB_DELALLOC_RESERVED)) {

		spin_lock(&EXT4_I(inode)->i_block_reservation_lock);

		spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);

		dquot_alloc_block_nofail(inode,

				EXT4_C2B(EXT4_SB(inode->i_sb), ar.len));

	}

fs/ext4/bitmap.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 */



#include <linux/buffer_head.h>

#include <linux/jbd2.h>

#include "ext4.h"



unsigned int ext4_count_free(char *bitmap, unsigned int numchars)