This series gets rid of some ifdefs in the UBFIS code. fscrypt folks are on Cc because I introduce a static inline wrapper for setting the super_block.s_cop ops so that filesystems do not have to add a #ifdef CONFIG_FS_ENCRYPTION around setting the ops. I can do this as an extra patch if that's desired. Sascha Sascha Hauer (2): ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION ubifs: Remove ifdefs around CONFIG_UBIFS_ATIME_SUPPORT fs/ubifs/dir.c | 2 -- fs/ubifs/file.c | 16 +++++++--------- fs/ubifs/ioctl.c | 11 +---------- fs/ubifs/sb.c | 7 ++++--- fs/ubifs/super.c | 20 +++++++++----------- fs/ubifs/ubifs.h | 2 -- include/linux/fscrypt.h | 11 +++++++++++ 7 files changed, 32 insertions(+), 37 deletions(-) -- 2.20.1
|