Pull f2fs update from Jaegeuk Kim: "In this round, we've mainly focused on performance tuning and critical bug fixes occurred in low-end devices. Sheng Yong introduced lost_found feature to keep missing files during recovery instead of thrashing them. We're preparing coming fsverity implementation. And, we've got more features to communicate with users for better performance. In low-end devices, some memory-related issues were fixed, and subtle race condtions and corner cases were addressed as well. Enhancements: - large nat bitmaps for more free node ids - add three block allocation policies to pass down write hints given by user - expose extension list to user and introduce hot file extension - tune small devices seamlessly for low-end devices - set readdir_ra by default - give more resources under gc_urgent mode regarding to discard and cleaning - introduce fsync_mode to enforce posix or not - nowait aio support - add lost_found feature to keep dangling inodes - reserve bits for future fsverity feature - add test_dummy_encryption for FBE Bug fixes: - don't use highmem for dentry pages - align memory boundary for bitops - truncate preallocated blocks in write errors - guarantee i_times on fsync call - clear CP_TRIMMED_FLAG correctly - prevent node chain loop during recovery - avoid data race between atomic write and background cleaning - avoid unnecessary selinux violation warnings on resgid option - GFP_NOFS to avoid deadlock in quota and read paths - fix f2fs_skip_inode_update to allow i_size recovery In addition to the above, there are several minor bug fixes and clean-ups" Cherry-pick from origin/upstream-f2fs-stable-linux-4.4.y:42bf67fc54
f2fs: remain written times to update inode during fsync6cb5aa02bf
f2fs: make assignment of t->dentry_bitmap more readablea8d07f1f9c
f2fs: truncate preallocated blocks in error case86444d6006
f2fs: fix a wrong condition in f2fs_skip_inode_updatedb2188a687
f2fs: reserve bits for fs-verityee2e74b3f0
f2fs: Add a segment type check in inplace write0192e0a450
f2fs: no need to initialize zero value for GFP_F2FS_ZERO49338842e9
f2fs: don't track new nat entry in nat setd6a69d5e65
f2fs: clean up with F2FS_BLK_ALIGN2c8834a7a2
f2fs: check blkaddr more accuratly before issue a bio6ab573a9d9
f2fs: Set GF_NOFS in read_cache_page_gfp while doing f2fs_quota_read7419dcb8be
f2fs: introduce a new mount option test_dummy_encryption9321e22c03
f2fs: introduce F2FS_FEATURE_LOST_FOUND feature8a57196158
f2fs: release locks before return in f2fs_ioc_gc_range()739ace131c
f2fs: align memory boundary for bitops4c55abe4f8
f2fs: remove unneeded set_cold_node()30654507e0
f2fs: add nowait aio supportd909e94106
f2fs: wrap all options with f2fs_sb_info.mount_opt5738be52b3
f2fs: Don't overwrite all types of node to keep node chain0bdeb167c8
f2fs: introduce mount option for fsync mode6bc490f0ee
f2fs: fix to restore old mount option in ->remount_fs0c9c3e0344
f2fs: wrap sb_rdonly with f2fs_readonly6c6611223a
f2fs: avoid selinux denial on CAP_SYS_RESOURCE076a6f32fe
f2fs: support hot file extension58edcdbca6
f2fs: fix to avoid race in between atomic write and background GC1e0aeb0af9
f2fs: do gc in greedy mode for whole range if gc_urgent mode is set10b2d001d6
f2fs: issue discard aggressively in the gc_urgent modea5052f32b9
f2fs: set readdir_ra by default1aa536a624
f2fs: add auto tuning for small devices0ffdffc8f1
f2fs: add mount option for segment allocation policyb798298912
f2fs: don't stop GC if GC is contended766d232169
f2fs: expose extension_list sysfs entry98b329de50
f2fs: fix to set KEEP_SIZE bit in f2fs_zero_range4d409fa334
f2fs: introduce sb_lock to make encrypt pwsalt update exclusive1f6bac14c1
f2fs: remove redundant initialization of pointer 'p'946aefc754
f2fs: flush cp pack except cp pack 2 page at firste5081a52ac
f2fs: clean up f2fs_sb_has_xxx functionsa292477154
f2fs: remove redundant check of page type when submit bio190e64a819
f2fs: fix to handle looped node chain during recovery889d980876
f2fs: handle quota for orphan inodes92b12bb1a2
f2fs: support passing down write hints to block layer with F2FS policy22fa74c2b0
f2fs: support passing down write hints given by users to block layer180900373e
f2fs: fix to clear CP_TRIMMED_FLAG0671fae134
f2fs: support large nat bitmapeceb943d5d
f2fs: fix to check extent cache in f2fs_drop_extent_tree2e2a339c98
f2fs: restrict inline_xattr_size configuration41dda11641
f2fs: fix heap mode to reset it back39575737bb
f2fs: fix potential corruption in area before F2FS_SUPER_OFFSET7e0e7995ee
fscrypt: fix build with pre-4.6 gcc versions31d3279a4f
fscrypt: fix up fscrypt_fname_encrypted_size() for internal use82bec88856
fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names168a907828
fscrypt: calculate NUL-padding length in one place only042ae9f4cf
fscrypt: move fscrypt_symlink_data to fscrypt_private.hf9550c24c2
fscrypt: remove fscrypt_fname_usr_to_disk()7ac4756a24
f2fs: switch to fscrypt_get_symlink()6b76f58e24
f2fs: switch to fscrypt ->symlink() helper functionsfd457d2c4e
fscrypt: new helper function - fscrypt_get_symlink()a1cdacb7ae
fscrypt: new helper functions for ->symlink()7f43602f4d
fscrypt: trim down fscrypt.h includesd9cadc11bd
fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.ce6fe930580
fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.hefefa434f4
fscrypt: move fscrypt_operations declaration to fscrypt_supp.h7ed178bc8a
fscrypt: split fscrypt_dummy_context_enabled() into supp/notsupp versions3f16e09dad
fscrypt: move fscrypt_ctx declaration to fscrypt_supp.h8216a0b51a
fscrypt: move fscrypt_info_cachep declaration to fscrypt_private.hdfe0b3b1b6
fscrypt: move fscrypt_control_page() to supp/notsupp headers3a2c791778
fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
233 lines
4.9 KiB
C
233 lines
4.9 KiB
C
/*
|
|
* fscrypt_notsupp.h
|
|
*
|
|
* This stubs out the fscrypt functions for filesystems configured without
|
|
* encryption support.
|
|
*
|
|
* Do not include this file directly. Use fscrypt.h instead!
|
|
*/
|
|
#ifndef _LINUX_FSCRYPT_H
|
|
#error "Incorrect include of linux/fscrypt_notsupp.h!"
|
|
#endif
|
|
|
|
#ifndef _LINUX_FSCRYPT_NOTSUPP_H
|
|
#define _LINUX_FSCRYPT_NOTSUPP_H
|
|
|
|
static inline bool fscrypt_has_encryption_key(const struct inode *inode)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline bool fscrypt_dummy_context_enabled(struct inode *inode)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
/* crypto.c */
|
|
static inline struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode,
|
|
gfp_t gfp_flags)
|
|
{
|
|
return ERR_PTR(-EOPNOTSUPP);
|
|
}
|
|
|
|
static inline void fscrypt_release_ctx(struct fscrypt_ctx *ctx)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline struct page *fscrypt_encrypt_page(const struct inode *inode,
|
|
struct page *page,
|
|
unsigned int len,
|
|
unsigned int offs,
|
|
u64 lblk_num, gfp_t gfp_flags)
|
|
{
|
|
return ERR_PTR(-EOPNOTSUPP);
|
|
}
|
|
|
|
static inline int fscrypt_decrypt_page(const struct inode *inode,
|
|
struct page *page,
|
|
unsigned int len, unsigned int offs,
|
|
u64 lblk_num)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline struct page *fscrypt_control_page(struct page *page)
|
|
{
|
|
WARN_ON_ONCE(1);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
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)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int fscrypt_has_permitted_context(struct inode *parent,
|
|
struct inode *child)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int fscrypt_inherit_context(struct inode *parent,
|
|
struct inode *child,
|
|
void *fs_data, bool preload)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
/* keyinfo.c */
|
|
static inline int fscrypt_get_encryption_info(struct inode *inode)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void fscrypt_put_encryption_info(struct inode *inode,
|
|
struct fscrypt_info *ci)
|
|
{
|
|
return;
|
|
}
|
|
|
|
/* fname.c */
|
|
static inline int fscrypt_setup_filename(struct inode *dir,
|
|
const struct qstr *iname,
|
|
int lookup, struct fscrypt_name *fname)
|
|
{
|
|
if (IS_ENCRYPTED(dir))
|
|
return -EOPNOTSUPP;
|
|
|
|
memset(fname, 0, sizeof(struct fscrypt_name));
|
|
fname->usr_fname = iname;
|
|
fname->disk_name.name = (unsigned char *)iname->name;
|
|
fname->disk_name.len = iname->len;
|
|
return 0;
|
|
}
|
|
|
|
static inline void fscrypt_free_filename(struct fscrypt_name *fname)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline int fscrypt_fname_alloc_buffer(const struct inode *inode,
|
|
u32 max_encrypted_len,
|
|
struct fscrypt_str *crypto_str)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void fscrypt_fname_free_buffer(struct fscrypt_str *crypto_str)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline int fscrypt_fname_disk_to_usr(struct inode *inode,
|
|
u32 hash, u32 minor_hash,
|
|
const struct fscrypt_str *iname,
|
|
struct fscrypt_str *oname)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline bool fscrypt_match_name(const struct fscrypt_name *fname,
|
|
const u8 *de_name, u32 de_name_len)
|
|
{
|
|
/* Encryption support disabled; use standard comparison */
|
|
if (de_name_len != fname->disk_name.len)
|
|
return false;
|
|
return !memcmp(de_name, fname->disk_name.name, fname->disk_name.len);
|
|
}
|
|
|
|
/* bio.c */
|
|
static inline void fscrypt_decrypt_bio_pages(struct fscrypt_ctx *ctx,
|
|
struct bio *bio)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void fscrypt_pullback_bio_page(struct page **page, bool restore)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
|
|
sector_t pblk, unsigned int len)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
/* hooks.c */
|
|
|
|
static inline int fscrypt_file_open(struct inode *inode, struct file *filp)
|
|
{
|
|
if (IS_ENCRYPTED(inode))
|
|
return -EOPNOTSUPP;
|
|
return 0;
|
|
}
|
|
|
|
static inline int __fscrypt_prepare_link(struct inode *inode,
|
|
struct inode *dir)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int __fscrypt_prepare_rename(struct inode *old_dir,
|
|
struct dentry *old_dentry,
|
|
struct inode *new_dir,
|
|
struct dentry *new_dentry,
|
|
unsigned int flags)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int __fscrypt_prepare_lookup(struct inode *dir,
|
|
struct dentry *dentry)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int __fscrypt_prepare_symlink(struct inode *dir,
|
|
unsigned int len,
|
|
unsigned int max_len,
|
|
struct fscrypt_str *disk_link)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int __fscrypt_encrypt_symlink(struct inode *inode,
|
|
const char *target,
|
|
unsigned int len,
|
|
struct fscrypt_str *disk_link)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void *fscrypt_get_symlink(struct inode *inode,
|
|
const void *caddr,
|
|
unsigned int max_size)
|
|
{
|
|
return ERR_PTR(-EOPNOTSUPP);
|
|
}
|
|
|
|
#endif /* _LINUX_FSCRYPT_NOTSUPP_H */
|