ntfs3: remove legacy ntfs driver support

Reverts the following commits that introduced legacy ntfs
driver alias and related support code:

74871791ffa9 ntfs3: serve as alias for the legacy ntfs driver
1ff2e956608c fs/ntfs3: Redesign legacy ntfs support
9b872cc50daa ntfs3: add legacy ntfs file operations
d55f90e9b243 ntfs3: enforce read-only when used as legacy ntfs driver

The legacy ntfs driver has been remade as a new implementation, so the
alias and related codes in ntfs3 are no longer needed.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>

diff --git a/fs/ntfs3/Kconfig b/fs/ntfs3/Kconfig
index 7bc31d69f680dd996f8503c9d06f0a0b96522e80..cdfdf51e55d797e0e5fecc349e2f157f09fea7d8 100644 (file)
--- a/fs/ntfs3/Kconfig
+++ b/fs/ntfs3/Kconfig
@@ -46,12 +46,3 @@ config NTFS3_FS_POSIX_ACL
          NOTE: this is linux only feature. Windows will ignore these ACLs.
 
          If you don't know what Access Control Lists are, say N.
-
-config NTFS_FS
-       tristate "NTFS file system support"
-       select NTFS3_FS
-       select BUFFER_HEAD
-       select NLS
-       help
-         This config option is here only for backward compatibility. NTFS
-         filesystem is now handled by the NTFS3 driver.

diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index 4652a56ad105175f097a41f565df1c718a0ceb0d..d99ab086ef6fe0a21ed8c35a5c2298211906c13f 100644 (file)
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -676,14 +676,4 @@ const struct file_operations ntfs_dir_operations = {
 #endif
        .setlease       = generic_setlease,
 };
-
-#if IS_ENABLED(CONFIG_NTFS_FS)
-const struct file_operations ntfs_legacy_dir_operations = {
-       .llseek         = generic_file_llseek,
-       .read           = generic_read_dir,
-       .iterate_shared = ntfs_readdir,
-       .open           = ntfs_file_open,
-       .setlease       = generic_setlease,
-};
-#endif
 // clang-format on

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index f53037e0ecb683706340419a346f9440136890ec..a45d1944514173f2e5b29eebf72e3cc53250dd15 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -1569,15 +1569,4 @@ const struct file_operations ntfs_file_operations = {
        .release        = ntfs_file_release,
        .setlease       = generic_setlease,
 };
-
-#if IS_ENABLED(CONFIG_NTFS_FS)
-const struct file_operations ntfs_legacy_file_operations = {
-       .llseek         = generic_file_llseek,
-       .read_iter      = ntfs_file_read_iter,
-       .splice_read    = ntfs_file_splice_read,
-       .open           = ntfs_file_open,
-       .release        = ntfs_file_release,
-       .setlease       = generic_setlease,
-};
-#endif
 // clang-format on

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 6e65066ebcc1ae81d3bfdd14f4babfc2898b075e..d2009053c93a1ca945ab817f7351f41af10acb3f 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -443,9 +443,7 @@ end_enum:
                 * Usually a hard links to directories are disabled.
                 */
                inode->i_op = &ntfs_dir_inode_operations;
-               inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
-                                      &ntfs_legacy_dir_operations :
-                                      &ntfs_dir_operations;
+               inode->i_fop = &ntfs_dir_operations;
                ni->i_valid = 0;
        } else if (S_ISLNK(mode)) {
                ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY;
@@ -455,9 +453,7 @@ end_enum:
        } else if (S_ISREG(mode)) {
                ni->std_fa &= ~FILE_ATTRIBUTE_DIRECTORY;
                inode->i_op = &ntfs_file_inode_operations;
-               inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
-                                      &ntfs_legacy_file_operations :
-                                      &ntfs_file_operations;
+               inode->i_fop = &ntfs_file_operations;
                inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr :
                                                              &ntfs_aops;
                if (ino != MFT_REC_MFT)
@@ -1646,9 +1642,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
 
        if (S_ISDIR(mode)) {
                inode->i_op = &ntfs_dir_inode_operations;
-               inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
-                                      &ntfs_legacy_dir_operations :
-                                      &ntfs_dir_operations;
+               inode->i_fop = &ntfs_dir_operations;
        } else if (S_ISLNK(mode)) {
                inode->i_op = &ntfs_link_inode_operations;
                inode->i_fop = NULL;
@@ -1657,9 +1651,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
                inode_nohighmem(inode);
        } else if (S_ISREG(mode)) {
                inode->i_op = &ntfs_file_inode_operations;
-               inode->i_fop = unlikely(is_legacy_ntfs(sb)) ?
-                                      &ntfs_legacy_file_operations :
-                                      &ntfs_file_operations;
+               inode->i_fop = &ntfs_file_operations;
                inode->i_mapping->a_ops = is_compressed(ni) ? &ntfs_aops_cmpr :
                                                              &ntfs_aops;
                init_rwsem(&ni->file.run_lock);

diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index 921b526eb0f4de1e7037efae486ff1776c13e852..2a7971f27e67be6a08b8000320abd5be974bde17 100644 (file)
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -530,7 +530,6 @@ struct inode *dir_search_u(struct inode *dir, const struct cpu_str *uni,
                           struct ntfs_fnd *fnd);
 bool dir_is_empty(struct inode *dir);
 extern const struct file_operations ntfs_dir_operations;
-extern const struct file_operations ntfs_legacy_dir_operations;
 
 /* Globals from file.c */
 int ntfs_getattr(struct mnt_idmap *idmap, const struct path *path,
@@ -546,7 +545,6 @@ long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg);
 extern const struct inode_operations ntfs_special_inode_operations;
 extern const struct inode_operations ntfs_file_inode_operations;
 extern const struct file_operations ntfs_file_operations;
-extern const struct file_operations ntfs_legacy_file_operations;
 
 /* Globals from frecord.c */
 void ni_remove_mi(struct ntfs_inode *ni, struct mft_inode *mi);
@@ -1250,13 +1248,4 @@ static inline void le64_sub_cpu(__le64 *var, u64 val)
        *var = cpu_to_le64(le64_to_cpu(*var) - val);
 }
 
-#if IS_ENABLED(CONFIG_NTFS_FS)
-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 */

diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 27411203082a45326317fbfc86b73bdca4cf8434..47c11547c9720cd215732e61ef31ffbbf31db325 100644 (file)
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -434,12 +434,6 @@ static int ntfs_fs_reconfigure(struct fs_context *fc)
        struct ntfs_mount_options *new_opts = fc->fs_private;
        int ro_rw;
 
-       /* If ntfs3 is used as legacy ntfs enforce read-only mode. */
-       if (is_legacy_ntfs(sb)) {
-               fc->sb_flags |= SB_RDONLY;
-               goto out;
-       }
-
        ro_rw = sb_rdonly(sb) && !(fc->sb_flags & SB_RDONLY);
        if (ro_rw && (sbi->flags & NTFS_FLAGS_NEED_REPLAY)) {
                errorf(fc,
@@ -466,7 +460,6 @@ static int ntfs_fs_reconfigure(struct fs_context *fc)
                return -EINVAL;
        }
 
-out:
        sync_filesystem(sb);
        swap(sbi->options, fc->fs_private);
 
@@ -1699,8 +1692,6 @@ load_root:
 
        ntfs_create_procdir(sb);
 
-       if (is_legacy_ntfs(sb))
-               sb->s_flags |= SB_RDONLY;
        return 0;
 
 put_inode_out:
@@ -1823,7 +1814,7 @@ static const struct fs_context_operations ntfs_context_ops = {
  * This will called when mount/remount. We will first initialize
  * options so that if remount we can use just that.
  */
-static int __ntfs_init_fs_context(struct fs_context *fc)
+static int ntfs_init_fs_context(struct fs_context *fc)
 {
        struct ntfs_mount_options *opts;
        struct ntfs_sb_info *sbi;
@@ -1877,11 +1868,6 @@ free_opts:
        return -ENOMEM;
 }
 
-static int ntfs_init_fs_context(struct fs_context *fc)
-{
-       return __ntfs_init_fs_context(fc);
-}
-
 static void ntfs3_kill_sb(struct super_block *sb)
 {
        struct ntfs_sb_info *sbi = sb->s_fs_info;
@@ -1903,47 +1889,6 @@ static struct file_system_type ntfs_fs_type = {
        .fs_flags               = FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
 };
 
-#if IS_ENABLED(CONFIG_NTFS_FS)
-static int ntfs_legacy_init_fs_context(struct fs_context *fc)
-{
-       int ret;
-
-       ret = __ntfs_init_fs_context(fc);
-       /* If ntfs3 is used as legacy ntfs enforce read-only mode. */
-       fc->sb_flags |= SB_RDONLY;
-       return ret;
-}
-
-static struct file_system_type ntfs_legacy_fs_type = {
-       .owner                  = THIS_MODULE,
-       .name                   = "ntfs",
-       .init_fs_context        = ntfs_legacy_init_fs_context,
-       .parameters             = ntfs_fs_parameters,
-       .kill_sb                = ntfs3_kill_sb,
-       .fs_flags               = FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
-};
-MODULE_ALIAS_FS("ntfs");
-
-static inline void register_as_ntfs_legacy(void)
-{
-       int err = register_filesystem(&ntfs_legacy_fs_type);
-       if (err)
-               pr_warn("ntfs3: Failed to register legacy ntfs filesystem driver: %d\n", err);
-}
-
-static inline void unregister_as_ntfs_legacy(void)
-{
-       unregister_filesystem(&ntfs_legacy_fs_type);
-}
-bool is_legacy_ntfs(struct super_block *sb)
-{
-       return sb->s_type == &ntfs_legacy_fs_type;
-}
-#else
-static inline void register_as_ntfs_legacy(void) {}
-static inline void unregister_as_ntfs_legacy(void) {}
-#endif
-
 // clang-format on
 
 static int __init init_ntfs_fs(void)
@@ -1972,7 +1917,6 @@ static int __init init_ntfs_fs(void)
                goto out1;
        }
 
-       register_as_ntfs_legacy();
        err = register_filesystem(&ntfs_fs_type);
        if (err)
                goto out;
@@ -1992,7 +1936,6 @@ static void __exit exit_ntfs_fs(void)
        rcu_barrier();
        kmem_cache_destroy(ntfs_inode_cachep);
        unregister_filesystem(&ntfs_fs_type);
-       unregister_as_ntfs_legacy();
        ntfs3_exit_bitmap();
        ntfs_remove_proc_root();
 }