kevin/linux
1
Fork 0
Code

fs/ntfs3: Redesign legacy ntfs support

Browse Source 
1) Make is_legacy_ntfs static inline.
2) Put legacy file_operations under #if IS_ENABLED(CONFIG_NTFS_FS).

Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Christian Brauner <brauner@kernel.org>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Konstantin Komarov 2024-06-17 15:03:21 +03:00
parent b9906f8162
commit 1ff2e95660
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ntfs3/dir.c
View File

@ -631,10 +631,12 @@ const struct file_operations ntfs_dir_operations = {
#endif #endif
}; };
#if IS_ENABLED(CONFIG_NTFS_FS)
const struct file_operations ntfs_legacy_dir_operations = { const struct file_operations ntfs_legacy_dir_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = generic_read_dir, .read = generic_read_dir,
.iterate_shared = ntfs_readdir, .iterate_shared = ntfs_readdir,
.open = ntfs_file_open, .open = ntfs_file_open,
}; };
#endif
// clang-format on // clang-format on

2
fs/ntfs3/file.c
View File

@ -1242,6 +1242,7 @@ const struct file_operations ntfs_file_operations = {
.release = ntfs_file_release, .release = ntfs_file_release,
}; };
#if IS_ENABLED(CONFIG_NTFS_FS)
const struct file_operations ntfs_legacy_file_operations = { const struct file_operations ntfs_legacy_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read_iter = ntfs_file_read_iter, .read_iter = ntfs_file_read_iter,
@ -1249,4 +1250,5 @@ const struct file_operations ntfs_legacy_file_operations = {
.open = ntfs_file_open, .open = ntfs_file_open,
.release = ntfs_file_release, .release = ntfs_file_release,
}; };
#endif
// clang-format on // clang-format on

28
fs/ntfs3/inode.c
View File

@ -441,10 +441,9 @@ end_enum:
* Usually a hard links to directories are disabled. * Usually a hard links to directories are disabled.
*/ */
inode->i_op = &ntfs_dir_inode_operations; inode->i_op = &ntfs_dir_inode_operations;
if (is_legacy_ntfs(inode->i_sb)) inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
inode->i_fop = &ntfs_legacy_dir_operations; &ntfs_legacy_dir_operations :
else &ntfs_dir_operations;
inode->i_fop = &ntfs_dir_operations;
ni->i_valid = 0; ni->i_valid = 0;
} else if (S_ISLNK(mode)) { } else if (S_ISLNK(mode)) {
ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY; ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY;
@ -454,10 +453,9 @@ end_enum:
} else if (S_ISREG(mode)) { } else if (S_ISREG(mode)) {
ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY; ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY;
inode->i_op = &ntfs_file_inode_operations; inode->i_op = &ntfs_file_inode_operations;
if (is_legacy_ntfs(inode->i_sb)) inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
inode->i_fop = &ntfs_legacy_file_operations; &ntfs_legacy_file_operations :
else &ntfs_file_operations;
inode->i_fop = &ntfs_file_operations;
inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr : inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr :
&ntfs_aops; &ntfs_aops;
if (ino != MFT_REC_MFT) if (ino != MFT_REC_MFT)
@ -1627,10 +1625,9 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
if (S_ISDIR(mode)) { if (S_ISDIR(mode)) {
inode->i_op = &ntfs_dir_inode_operations; inode->i_op = &ntfs_dir_inode_operations;
if (is_legacy_ntfs(inode->i_sb)) inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
inode->i_fop = &ntfs_legacy_dir_operations; &ntfs_legacy_dir_operations :
else &ntfs_dir_operations;
inode->i_fop = &ntfs_dir_operations;
} else if (S_ISLNK(mode)) { } else if (S_ISLNK(mode)) {
inode->i_op = &ntfs_link_inode_operations; inode->i_op = &ntfs_link_inode_operations;
inode->i_fop = NULL; inode->i_fop = NULL;
@ -1639,10 +1636,9 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
inode_nohighmem(inode); inode_nohighmem(inode);
} else if (S_ISREG(mode)) { } else if (S_ISREG(mode)) {
inode->i_op = &ntfs_file_inode_operations; inode->i_op = &ntfs_file_inode_operations;
if (is_legacy_ntfs(inode->i_sb)) inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
inode->i_fop = &ntfs_legacy_file_operations; &ntfs_legacy_file_operations :
else &ntfs_file_operations;
inode->i_fop = &ntfs_file_operations;
inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr : inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr :
&ntfs_aops; &ntfs_aops;
init_rwsem(&ni->file.run_lock); init_rwsem(&ni->file.run_lock);

7
fs/ntfs3/ntfs_fs.h
View File

@ -1140,6 +1140,13 @@ static inline void le64_sub_cpu(__le64 *var, u64 val)
*var = cpu_to_le64(le64_to_cpu(*var) - val); *var = cpu_to_le64(le64_to_cpu(*var) - val);
} }
#if IS_ENABLED(CONFIG_NTFS_FS)
bool is_legacy_ntfs(struct super_block *sb); bool is_legacy_ntfs(struct super_block *sb);
#else
static inline bool is_legacy_ntfs(struct super_block *sb)
{
return false;
}
#endif
#endif /* _LINUX_NTFS3_NTFS_FS_H */ #endif /* _LINUX_NTFS3_NTFS_FS_H */

2
fs/ntfs3/super.c
View File

@ -1837,10 +1837,8 @@ bool is_legacy_ntfs(struct super_block *sb)
#else #else
static inline void register_as_ntfs_legacy(void) {} static inline void register_as_ntfs_legacy(void) {}
static inline void unregister_as_ntfs_legacy(void) {} static inline void unregister_as_ntfs_legacy(void) {}
bool is_legacy_ntfs(struct super_block *sb) { return false; }
#endif #endif
// clang-format on // clang-format on
static int __init init_ntfs_fs(void) static int __init init_ntfs_fs(void)