From nobody Sun Feb 8 14:12:58 2026 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 056EC346A0B for ; Mon, 2 Feb 2026 22:19:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770070767; cv=none; b=RWcVg8Gv+v1a/yBDMMGvlKPEEHStWVx6F4iATKZ+S4ORnjQn9IA0/HSnxVYZxHeHO4sw4DRRp3CAkbpDvO13y9bfdMXrK7Xtbx27iP32NEsAbN+yhyMY6fI8hSmApOTe/5RaS9btIDY+b9Qepvkk1LrpwQXtvENEBJ3FghLI4lE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770070767; c=relaxed/simple; bh=9B1/qe9fS4OMMJVHJtefueGBv0iCGADk9h8r4R4vDHk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z9U/VDET4enPCQdT+mUu34i6GGnsB5x9kdWmH93iQpHwLee+e3PgNFqpdQMWIObeww8p5EZJrGEDLN1GaAAid7Zy9wPg5LjuRiFe9Z3uITIQo1qcfvYZOU3dRWx7Ygva9X8sHfQhkZXt9L1DE6XNcvIDn5RI7wS0mHqjjNEKIXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-8230d228372so2700104b3a.1 for ; Mon, 02 Feb 2026 14:19:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770070765; x=1770675565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Lz8iAve24z80w7uvaD5L+7iMrBJ1WUFOp4RKbcgPJEs=; b=DVuTmclPA/GBqEqRAIZLoj3s+bxU23EUuaU3nBieVDp4I+YoVkdj9zQuQ0+FJCcuZw zLl7QZzgLt5jJ/tGLzc1a9PgVn9OJ7HU+sYyeiagaHp4Fu6MCaotpd9bM6hngX/f1mY5 yOFKBxvdIiz8FwitFo7PLaLYPuQUQKB3zrnfNtmRUhE/7EZPHRTk372qVS+spf/oJvuT w7hNnZfNRPeLcis0RNoXQNimSNYa5HP/Dxtr5d6ux5FrN/f/wB4caw3R3zAiawIoyDUv rVcdVvAy6A84TQ+Ol2qGDlfwuPMn1mNDLSv8o49AZWIFU+anKkCWNQpVo1nKYoyT+Md/ EXcw== X-Forwarded-Encrypted: i=1; AJvYcCUiPkADLDsu2dsix4EiQpIY/frr3EwWBVf1c40BEcHpihiRBv3mDPHqydNUTymt0iQgJWh7dOoKAOWyqlI=@vger.kernel.org X-Gm-Message-State: AOJu0Ywz1NsdnbrKoxrZ9HYsLv/N0nxgTUjjJm4bDACAr9yEPHAZALT/ yoiI4VKAqK/taEymNSl28xxdxPoKBmwZlLLDXivZysrMCTuaKgLChKOo X-Gm-Gg: AZuq6aIzU3MaT0TBLw5AGvgTy8GxJtJzD3haz0fjxKW792HKsng74cu+JVmx8TqFRWS 0JVQqYipBKwxKaSHY5Xn+17sOhj4d1OvTLFdHGYeiqiUeh2S45BcowRoLtVvieoc0h717DAH/T3 eDc/6NRI/NCoveq2FawBxpMpBhh8v2bpg8scKEkItSG1x4j8IsEGYNVgbU3CbjYnYwpvTlRmYDE czHOtStknDgXwEAtvuPmflOeYQOsMbMAFtQLczkvEveWKs2xJvqfEWgG10Yt/c8bSWIasnbfqfP iNYQ+Io0Msfs4ZHZUIhYwX/C2qH57tpm0wNJb3ZxOtbpzU7HHuw+qarDr6mI/Yka2YBXV5M5EMm AqIsefCPEs/cqR+bUew/jpTyyhmcwTkL/E5n+EclAvaB5vBXvpaFiTB784c/CRLTDWrXdcjVDvq nkNuJO2IZMo9l87GeBSQzIEZpCGQ== X-Received: by 2002:a05:6a00:a226:b0:819:5db9:6ac0 with SMTP id d2e1a72fcca58-823ab758d86mr12586849b3a.37.1770070765248; Mon, 02 Feb 2026 14:19:25 -0800 (PST) Received: from localhost.localdomain ([1.227.206.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82379b6b277sm21019732b3a.29.2026.02.02.14.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Feb 2026 14:19:24 -0800 (PST) From: Namjae Jeon To: viro@zeniv.linux.org.uk, brauner@kernel.org, hch@lst.de, tytso@mit.edu, willy@infradead.org, jack@suse.cz, djwong@kernel.org, josef@toxicpanda.com, sandeen@sandeen.net, rgoldwyn@suse.com, xiang@kernel.org, dsterba@suse.com, pali@kernel.org, ebiggers@kernel.org, neil@brown.name, amir73il@gmail.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, iamjoonsoo.kim@lge.com, cheol.lee@lge.com, jay.sim@lge.com, gunho.lee@lge.com, Namjae Jeon Subject: [PATCH v6 14/16] ntfs3: remove legacy ntfs driver support Date: Tue, 3 Feb 2026 07:02:00 +0900 Message-Id: <20260202220202.10907-15-linkinjeon@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260202220202.10907-1-linkinjeon@kernel.org> References: <20260202220202.10907-1-linkinjeon@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch 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 Signed-off-by: Namjae Jeon --- fs/ntfs3/Kconfig | 9 ------- fs/ntfs3/dir.c | 9 ------- fs/ntfs3/file.c | 10 -------- fs/ntfs3/inode.c | 16 ++++--------- fs/ntfs3/ntfs_fs.h | 11 --------- fs/ntfs3/super.c | 59 +--------------------------------------------- 6 files changed, 5 insertions(+), 109 deletions(-) diff --git a/fs/ntfs3/Kconfig b/fs/ntfs3/Kconfig index 7bc31d69f680..cdfdf51e55d7 100644 --- 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. =20 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 b98e95d6b4d9..fc39e7330365 100644 --- a/fs/ntfs3/dir.c +++ b/fs/ntfs3/dir.c @@ -631,13 +631,4 @@ const struct file_operations ntfs_dir_operations =3D { .compat_ioctl =3D ntfs_compat_ioctl, #endif }; - -#if IS_ENABLED(CONFIG_NTFS_FS) -const struct file_operations ntfs_legacy_dir_operations =3D { - .llseek =3D generic_file_llseek, - .read =3D generic_read_dir, - .iterate_shared =3D ntfs_readdir, - .open =3D ntfs_file_open, -}; -#endif // clang-format on diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c index 2e7b2e566ebe..0faa856fc470 100644 --- a/fs/ntfs3/file.c +++ b/fs/ntfs3/file.c @@ -1478,14 +1478,4 @@ const struct file_operations ntfs_file_operations = =3D { .fallocate =3D ntfs_fallocate, .release =3D ntfs_file_release, }; - -#if IS_ENABLED(CONFIG_NTFS_FS) -const struct file_operations ntfs_legacy_file_operations =3D { - .llseek =3D generic_file_llseek, - .read_iter =3D ntfs_file_read_iter, - .splice_read =3D ntfs_file_splice_read, - .open =3D ntfs_file_open, - .release =3D ntfs_file_release, -}; -#endif // clang-format on diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index 0a9ac5efeb67..826840c257d3 100644 --- a/fs/ntfs3/inode.c +++ b/fs/ntfs3/inode.c @@ -444,9 +444,7 @@ static struct inode *ntfs_read_mft(struct inode *inode, * Usually a hard links to directories are disabled. */ inode->i_op =3D &ntfs_dir_inode_operations; - inode->i_fop =3D unlikely(is_legacy_ntfs(sb)) ? - &ntfs_legacy_dir_operations : - &ntfs_dir_operations; + inode->i_fop =3D &ntfs_dir_operations; ni->i_valid =3D 0; } else if (S_ISLNK(mode)) { ni->std_fa &=3D ~FILE_ATTRIBUTE_DIRECTORY; @@ -456,9 +454,7 @@ static struct inode *ntfs_read_mft(struct inode *inode, } else if (S_ISREG(mode)) { ni->std_fa &=3D ~FILE_ATTRIBUTE_DIRECTORY; inode->i_op =3D &ntfs_file_inode_operations; - inode->i_fop =3D unlikely(is_legacy_ntfs(sb)) ? - &ntfs_legacy_file_operations : - &ntfs_file_operations; + inode->i_fop =3D &ntfs_file_operations; inode->i_mapping->a_ops =3D is_compressed(ni) ? &ntfs_aops_cmpr : &ntfs_aops; if (ino !=3D MFT_REC_MFT) @@ -1590,9 +1586,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct= inode *dir, =20 if (S_ISDIR(mode)) { inode->i_op =3D &ntfs_dir_inode_operations; - inode->i_fop =3D unlikely(is_legacy_ntfs(sb)) ? - &ntfs_legacy_dir_operations : - &ntfs_dir_operations; + inode->i_fop =3D &ntfs_dir_operations; } else if (S_ISLNK(mode)) { inode->i_op =3D &ntfs_link_inode_operations; inode->i_fop =3D NULL; @@ -1601,9 +1595,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct= inode *dir, inode_nohighmem(inode); } else if (S_ISREG(mode)) { inode->i_op =3D &ntfs_file_inode_operations; - inode->i_fop =3D unlikely(is_legacy_ntfs(sb)) ? - &ntfs_legacy_file_operations : - &ntfs_file_operations; + inode->i_fop =3D &ntfs_file_operations; inode->i_mapping->a_ops =3D 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 a4559c9f64e6..326644d23110 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -501,7 +501,6 @@ struct inode *dir_search_u(struct inode *dir, const str= uct 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; =20 /* Globals from file.c */ int ntfs_getattr(struct mnt_idmap *idmap, const struct path *path, @@ -516,7 +515,6 @@ long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsi= gned 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; =20 /* Globals from frecord.c */ void ni_remove_mi(struct ntfs_inode *ni, struct mft_inode *mi); @@ -1160,13 +1158,4 @@ static inline void le64_sub_cpu(__le64 *var, u64 val) *var =3D cpu_to_le64(le64_to_cpu(*var) - val); } =20 -#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 8b0cf0ed4f72..4e0448af3e7e 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -415,12 +415,6 @@ static int ntfs_fs_reconfigure(struct fs_context *fc) struct ntfs_mount_options *new_opts =3D fc->fs_private; int ro_rw; =20 - /* If ntfs3 is used as legacy ntfs enforce read-only mode. */ - if (is_legacy_ntfs(sb)) { - fc->sb_flags |=3D SB_RDONLY; - goto out; - } - ro_rw =3D sb_rdonly(sb) && !(fc->sb_flags & SB_RDONLY); if (ro_rw && (sbi->flags & NTFS_FLAGS_NEED_REPLAY)) { errorf(fc, @@ -447,7 +441,6 @@ static int ntfs_fs_reconfigure(struct fs_context *fc) return -EINVAL; } =20 -out: sync_filesystem(sb); swap(sbi->options, fc->fs_private); =20 @@ -1670,8 +1663,6 @@ static int ntfs_fill_super(struct super_block *sb, st= ruct fs_context *fc) =20 ntfs_create_procdir(sb); =20 - if (is_legacy_ntfs(sb)) - sb->s_flags |=3D SB_RDONLY; return 0; =20 put_inode_out: @@ -1796,7 +1787,7 @@ static const struct fs_context_operations ntfs_contex= t_ops =3D { * 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; @@ -1850,11 +1841,6 @@ static int __ntfs_init_fs_context(struct fs_context = *fc) return -ENOMEM; } =20 -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 =3D sb->s_fs_info; @@ -1876,47 +1862,6 @@ static struct file_system_type ntfs_fs_type =3D { .fs_flags =3D FS_REQUIRES_DEV | FS_ALLOW_IDMAP, }; =20 -#if IS_ENABLED(CONFIG_NTFS_FS) -static int ntfs_legacy_init_fs_context(struct fs_context *fc) -{ - int ret; - - ret =3D __ntfs_init_fs_context(fc); - /* If ntfs3 is used as legacy ntfs enforce read-only mode. */ - fc->sb_flags |=3D SB_RDONLY; - return ret; -} - -static struct file_system_type ntfs_legacy_fs_type =3D { - .owner =3D THIS_MODULE, - .name =3D "ntfs", - .init_fs_context =3D ntfs_legacy_init_fs_context, - .parameters =3D ntfs_fs_parameters, - .kill_sb =3D ntfs3_kill_sb, - .fs_flags =3D FS_REQUIRES_DEV | FS_ALLOW_IDMAP, -}; -MODULE_ALIAS_FS("ntfs"); - -static inline void register_as_ntfs_legacy(void) -{ - int err =3D 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 =3D=3D &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 =20 static int __init init_ntfs_fs(void) @@ -1945,7 +1890,6 @@ static int __init init_ntfs_fs(void) goto out1; } =20 - register_as_ntfs_legacy(); err =3D register_filesystem(&ntfs_fs_type); if (err) goto out; @@ -1965,7 +1909,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(); } --=20 2.25.1