mirror of https://github.com/OpenIPC/firmware.git
139 lines
5.3 KiB
Diff
139 lines
5.3 KiB
Diff
diff -drupN a/fs/ext4/ext4.h b/fs/ext4/ext4.h
|
|
--- a/fs/ext4/ext4.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/ext4/ext4.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -32,13 +32,15 @@
|
|
#include <linux/percpu_counter.h>
|
|
#include <linux/ratelimit.h>
|
|
#include <crypto/hash.h>
|
|
-#include <linux/fscrypto.h>
|
|
#include <linux/falloc.h>
|
|
#include <linux/percpu-rwsem.h>
|
|
#ifdef __KERNEL__
|
|
#include <linux/compat.h>
|
|
#endif
|
|
|
|
+#define __FS_HAS_ENCRYPTION IS_ENABLED(CONFIG_EXT4_FS_ENCRYPTION)
|
|
+#include <linux/fscrypt.h>
|
|
+
|
|
/*
|
|
* The fourth extended filesystem constants/structures
|
|
*/
|
|
@@ -1342,11 +1344,6 @@ struct ext4_super_block {
|
|
/* Number of quota types we support */
|
|
#define EXT4_MAXQUOTAS 3
|
|
|
|
-#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
|
-#define EXT4_KEY_DESC_PREFIX "ext4:"
|
|
-#define EXT4_KEY_DESC_PREFIX_SIZE 5
|
|
-#endif
|
|
-
|
|
/*
|
|
* fourth extended-fs super-block data in memory
|
|
*/
|
|
@@ -1516,12 +1513,6 @@ struct ext4_sb_info {
|
|
|
|
/* Barrier between changing inodes' journal flags and writepages ops. */
|
|
struct percpu_rw_semaphore s_journal_flag_rwsem;
|
|
-
|
|
- /* Encryption support */
|
|
-#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
|
- u8 key_prefix[EXT4_KEY_DESC_PREFIX_SIZE];
|
|
- u8 key_prefix_size;
|
|
-#endif
|
|
};
|
|
|
|
static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
|
|
@@ -2272,11 +2263,6 @@ extern unsigned ext4_free_clusters_after
|
|
struct ext4_group_desc *gdp);
|
|
ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
|
|
|
|
-static inline int ext4_sb_has_crypto(struct super_block *sb)
|
|
-{
|
|
- return ext4_has_feature_encrypt(sb);
|
|
-}
|
|
-
|
|
static inline bool ext4_encrypted_inode(struct inode *inode)
|
|
{
|
|
return ext4_test_inode_flag(inode, EXT4_INODE_ENCRYPT);
|
|
@@ -2325,28 +2311,6 @@ static inline int ext4_fname_setup_filen
|
|
}
|
|
static inline void ext4_fname_free_filename(struct ext4_filename *fname) { }
|
|
|
|
-#define fscrypt_set_d_op(i)
|
|
-#define fscrypt_get_ctx fscrypt_notsupp_get_ctx
|
|
-#define fscrypt_release_ctx fscrypt_notsupp_release_ctx
|
|
-#define fscrypt_encrypt_page fscrypt_notsupp_encrypt_page
|
|
-#define fscrypt_decrypt_page fscrypt_notsupp_decrypt_page
|
|
-#define fscrypt_decrypt_bio_pages fscrypt_notsupp_decrypt_bio_pages
|
|
-#define fscrypt_pullback_bio_page fscrypt_notsupp_pullback_bio_page
|
|
-#define fscrypt_restore_control_page fscrypt_notsupp_restore_control_page
|
|
-#define fscrypt_zeroout_range fscrypt_notsupp_zeroout_range
|
|
-#define fscrypt_process_policy fscrypt_notsupp_process_policy
|
|
-#define fscrypt_get_policy fscrypt_notsupp_get_policy
|
|
-#define fscrypt_has_permitted_context fscrypt_notsupp_has_permitted_context
|
|
-#define fscrypt_inherit_context fscrypt_notsupp_inherit_context
|
|
-#define fscrypt_get_encryption_info fscrypt_notsupp_get_encryption_info
|
|
-#define fscrypt_put_encryption_info fscrypt_notsupp_put_encryption_info
|
|
-#define fscrypt_setup_filename fscrypt_notsupp_setup_filename
|
|
-#define fscrypt_free_filename fscrypt_notsupp_free_filename
|
|
-#define fscrypt_fname_encrypted_size fscrypt_notsupp_fname_encrypted_size
|
|
-#define fscrypt_fname_alloc_buffer fscrypt_notsupp_fname_alloc_buffer
|
|
-#define fscrypt_fname_free_buffer fscrypt_notsupp_fname_free_buffer
|
|
-#define fscrypt_fname_disk_to_usr fscrypt_notsupp_fname_disk_to_usr
|
|
-#define fscrypt_fname_usr_to_disk fscrypt_notsupp_fname_usr_to_disk
|
|
#endif
|
|
|
|
/* dir.c */
|
|
@@ -2368,17 +2332,16 @@ extern int ext4_find_dest_de(struct inod
|
|
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))
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);
|
|
}
|
|
-static unsigned char ext4_filetype_table[] = {
|
|
+static const unsigned char ext4_filetype_table[] = {
|
|
DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
|
|
};
|
|
|
|
@@ -2445,7 +2408,8 @@ extern int ext4_mb_add_groupinfo(struct
|
|
ext4_group_t i, struct ext4_group_desc *desc);
|
|
extern int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
|
|
ext4_fsblk_t block, unsigned long count);
|
|
-extern int ext4_trim_fs(struct super_block *, struct fstrim_range *);
|
|
+extern int ext4_trim_fs(struct super_block *, struct fstrim_range *,
|
|
+ unsigned long blkdev_flags);
|
|
|
|
/* inode.c */
|
|
int ext4_inode_is_fast_symlink(struct inode *inode);
|
|
@@ -3038,9 +3002,6 @@ extern struct buffer_head *ext4_get_firs
|
|
extern int ext4_inline_data_fiemap(struct inode *inode,
|
|
struct fiemap_extent_info *fieinfo,
|
|
int *has_inline, __u64 start, __u64 len);
|
|
-extern int ext4_try_to_evict_inline_data(handle_t *handle,
|
|
- struct inode *inode,
|
|
- int needed);
|
|
extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline);
|
|
|
|
extern int ext4_convert_inline_data(struct inode *inode);
|
|
@@ -3065,7 +3026,7 @@ extern int ext4_handle_dirty_dirent_node
|
|
struct inode *inode,
|
|
struct buffer_head *bh);
|
|
#define S_SHIFT 12
|
|
-static unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {
|
|
+static const unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {
|
|
[S_IFREG >> S_SHIFT] = EXT4_FT_REG_FILE,
|
|
[S_IFDIR >> S_SHIFT] = EXT4_FT_DIR,
|
|
[S_IFCHR >> S_SHIFT] = EXT4_FT_CHRDEV,
|