From nobody Mon Apr 6 09:11:38 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 24CB933C194 for ; Fri, 13 Feb 2026 08:37:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770971826; cv=none; b=e/Mwv9Tdjs5cXPtEVB6AsaEsHfy/aVl4kyo9FmNx11q7zPoDvqD+gGRMR6jhZYiRG6jSkSkF+0P2bpviFXKJM/CHYJGbyt5EcIvurGg2/wePIkFLr4BHrMN9IXYlZpGrBp5rK724VjbqlTPCAB3PAOqjeiU8F3/wu2Rjrr6Iikc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770971826; c=relaxed/simple; bh=W5nSCHtyOagL9TbmZ/SsnjQqUukBNpFvkPfMj2bk8h0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dcze/VFdwO/Z5jwqYYuSUlys5zVHKKEyRb0CAY78DPJ4aQn15qUtpqJBwoHyAFe8B8emh6Jvov/R+wpSGkzMgPBwKyo6tMEYEHbhC4J++PZNocu3T66Zo3M13q514ZDo9m8xfgpHT4xeTMG/aez3TY2GwdILbX3/7TH1bGQzGhQ= 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.214.179 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-pl1-f179.google.com with SMTP id d9443c01a7336-2ab3b0e49a8so3203345ad.0 for ; Fri, 13 Feb 2026 00:37:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770971823; x=1771576623; 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=9mduh9fE0R1vDyBqx3UYB0Vd0oIghTTV8wTMQqdMQTo=; b=Bghp0Bki/HOiU8tW09IzRjv5IYCPx+1nEr9q18SW0tSk+E42jjaGcjWNLipDKbh3LV 84vas4nXIF1KT4Ov/yULUdUuYnfR3yC8wShdqb1ZkMCvzWzPk1gjBS49JMHLt9Vq/Xnv cPktqZeXBCDKE19c0hBgG9bBJc16anyHPTyRxFu5zlJvTvhfqXm4VbhjpernIlgCxIKm cRa10rvik6jKh4TkP9BTbJ4oL9L4YDsxiR85qiY8Jgv7ZZANovitmnUsvjFvbcIoQuAo zDGuEPUFcY4IoyKekxZwcZl5GebEGJQLeuJk7rzG4GgDyCZm0C17W27eYpOEJ2mSElHP 3zMQ== X-Forwarded-Encrypted: i=1; AJvYcCWc2xTNHKJ4iizO3n9iLLsTp+NQ5Qn4pMDBHNFGPsL3MJ5gnROhEmj88lm99BLEivprial/iaPb6AM0Mxw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz59F3kFdfoPSnAAX2Dx+KQVpYyKeN8b7MqeL9IhdM7+ds/g+Zp TLlVEciX+kc8NA/wptU0BsDfZHoJ5cI/ZaGqRDizqS3QTr5EMmVjkcHb X-Gm-Gg: AZuq6aKwuLhYB8PnVN3W3teQ0Q9M/acW/0I1fR5tjZvuvuhCt0bZ9icUIo/iPvXWVB4 PdWlPexarb1ZPdAYvzdH+xLQKC/ddigrj5rHDtvrAS86sO2beTVTdoU08nwur9HfCtmdT4WB9Y1 sDj+swRgPnwb3cZ0mRvSd8cSl7fYStyyprhllENN6yWuF9HS9q1qG9sy1DPEOfY3tHQM3CSqvdz rCU0Tk2HTEmzpbwPacSsUWTli18r0UL/gdXiWRcMDNwJj9sU0HYotcVed3MIUwXgNVxiIoOaqT8 ENLDSlsVketZ+VRKSE0Iy9qPQS5eNQ9EmLzvyJPuOOaj5EIHdkJxGx74XwOwR2IdBmouTcct0JU EAaI8amVA3a9tGsR29jsnjVjoDCWGItuM0xRoUTKFuIgIjwpfd5v6RaxP9ECgdyANWAqyF1jMSD DeJ0c13KTiamN3ZbHZYIWrmYtLQ/B75tAmIil8BA== X-Received: by 2002:a17:903:1b28:b0:2aa:e570:6e6d with SMTP id d9443c01a7336-2ab505a35b7mr12924105ad.40.1770971823351; Fri, 13 Feb 2026 00:37:03 -0800 (PST) Received: from localhost.localdomain ([1.227.206.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ab2984ad4asm75236495ad.6.2026.02.13.00.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 00:37:02 -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, dsterba@suse.com, pali@kernel.org, amir73il@gmail.com, xiang@kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Namjae Jeon Subject: [PATCH v9 14/17] ntfs3: remove legacy ntfs driver support Date: Fri, 13 Feb 2026 17:18:01 +0900 Message-Id: <20260213081804.13351-15-linkinjeon@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260213081804.13351-1-linkinjeon@kernel.org> References: <20260213081804.13351-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" 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 | 10 -------- fs/ntfs3/file.c | 11 --------- fs/ntfs3/inode.c | 16 ++++--------- fs/ntfs3/ntfs_fs.h | 11 --------- fs/ntfs3/super.c | 59 +--------------------------------------------- 6 files changed, 5 insertions(+), 111 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 596f8c62f033..3eab8609bb6f 100644 --- a/fs/ntfs3/dir.c +++ b/fs/ntfs3/dir.c @@ -632,14 +632,4 @@ const struct file_operations ntfs_dir_operations =3D { #endif .setlease =3D generic_setlease, }; - -#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, - .setlease =3D generic_setlease, -}; -#endif // clang-format on diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c index 6cb4479072a6..cc8cfbb6e1d6 100644 --- a/fs/ntfs3/file.c +++ b/fs/ntfs3/file.c @@ -1480,15 +1480,4 @@ const struct file_operations ntfs_file_operations = =3D { .release =3D ntfs_file_release, .setlease =3D generic_setlease, }; - -#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, - .setlease =3D generic_setlease, -}; -#endif // clang-format on diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index edfb973e4e82..de1d6eaf179d 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 f18349689458..93bec795b18a 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -502,7 +502,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, @@ -517,7 +516,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); @@ -1161,13 +1159,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