cifs: don't use 'pre:' for MODULE_SOFTDEP
Subsystems (3)
PATCH 1/1 cifs: don't use 'pre:' for MODULE_SOFTDEP
It can cause
to fail with
modprobe: FATAL: Module <module> is builtin.
RHBZ: 1767094
--- fs/cifs/cifsfs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
fs/cifs/cifsfs.c +12 -12
@@ -1677,17 +1677,17 @@ MODULE_DESCRIPTION ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and " "also older servers complying with the SNIA CIFS Specification)" );MODULE_VERSION (CIFS_VERSION ); -MODULE_SOFTDEP ("pre: ecb" ); -MODULE_SOFTDEP ("pre: hmac" ); -MODULE_SOFTDEP ("pre: md4" ); -MODULE_SOFTDEP ("pre: md5" ); -MODULE_SOFTDEP ("pre: nls" ); -MODULE_SOFTDEP ("pre: aes" ); -MODULE_SOFTDEP ("pre: cmac" ); -MODULE_SOFTDEP ("pre: sha256" ); -MODULE_SOFTDEP ("pre: sha512" ); -MODULE_SOFTDEP ("pre: aead2" ); -MODULE_SOFTDEP ("pre: ccm" ); -MODULE_SOFTDEP ("pre: gcm" ); +MODULE_SOFTDEP ("ecb" ); +MODULE_SOFTDEP ("hmac" ); +MODULE_SOFTDEP ("md4" ); +MODULE_SOFTDEP ("md5" ); +MODULE_SOFTDEP ("nls" ); +MODULE_SOFTDEP ("aes" ); +MODULE_SOFTDEP ("cmac" ); +MODULE_SOFTDEP ("sha256" ); +MODULE_SOFTDEP ("sha512" ); +MODULE_SOFTDEP ("aead2" ); +MODULE_SOFTDEP ("ccm" ); +MODULE_SOFTDEP ("gcm" );module_init (init_cifs)module_exit (exit_cifs)
Signature · 1 line
2.13.6
PATCH 1/1 cifs: don't use 'pre:' for MODULE_SOFTDEP
I noticed that btrfs and ext4 have the same bug
modprobe btrfs
modprobe -r btrfs
returns
"modprobe: FATAL: Module crc32c_intel is in use."
(although the module is actually unloaded despite the 'FATAL' error)
Should fs modules not use MODULE_SOFTDEP as Ronnie's patch suggests? ---------- Forwarded message ---------
From: Ronnie Sahlberg <[email protected]>
Date: Wed, Oct 30, 2019 at 10:59 PM
Subject: [PATCH] cifs: don't use 'pre:' for MODULE_SOFTDEP
To: linux-cifs <[email protected]>
Cc: Ronnie Sahlberg <[email protected]>
It can cause
to fail with
modprobe: FATAL: Module <module> is builtin.
RHBZ: 1767094
--- fs/cifs/cifsfs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
fs/cifs/cifsfs.c +12 -12
@@ -1677,17 +1677,17 @@ MODULE_DESCRIPTION ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and " "also older servers complying with the SNIA CIFS Specification)" );MODULE_VERSION (CIFS_VERSION ); -MODULE_SOFTDEP ("pre: ecb" ); -MODULE_SOFTDEP ("pre: hmac" ); -MODULE_SOFTDEP ("pre: md4" ); -MODULE_SOFTDEP ("pre: md5" ); -MODULE_SOFTDEP ("pre: nls" ); -MODULE_SOFTDEP ("pre: aes" ); -MODULE_SOFTDEP ("pre: cmac" ); -MODULE_SOFTDEP ("pre: sha256" ); -MODULE_SOFTDEP ("pre: sha512" ); -MODULE_SOFTDEP ("pre: aead2" ); -MODULE_SOFTDEP ("pre: ccm" ); -MODULE_SOFTDEP ("pre: gcm" ); +MODULE_SOFTDEP ("ecb" ); +MODULE_SOFTDEP ("hmac" ); +MODULE_SOFTDEP ("md4" ); +MODULE_SOFTDEP ("md5" ); +MODULE_SOFTDEP ("nls" ); +MODULE_SOFTDEP ("aes" ); +MODULE_SOFTDEP ("cmac" ); +MODULE_SOFTDEP ("sha256" ); +MODULE_SOFTDEP ("sha512" ); +MODULE_SOFTDEP ("aead2" ); +MODULE_SOFTDEP ("ccm" ); +MODULE_SOFTDEP ("gcm" );module_init (init_cifs)module_exit (exit_cifs)
--
2.13.6
Signature · 3 lines
Thanks, Steve
Tentatively merged into cifs-2.6.git for-next but am curious about the similar problem with ext4 and btrfs
Quoted 49 lines · Ronnie Sahlberg
It can cause
to fail with
modprobe: FATAL: Module <module> is builtin.RHBZ: 1767094
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/cifsfs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)fs/cifs/cifsfs.c +12
-13@@ -1677,17 +1677,17 @@ MODULE_DESCRIPTION ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and " "also older servers complying with the SNIA CIFS Specification)" );MODULE_VERSION (CIFS_VERSION ); -MODULE_SOFTDEP ("pre: ecb" ); -MODULE_SOFTDEP ("pre: hmac" ); -MODULE_SOFTDEP ("pre: md4" ); -MODULE_SOFTDEP ("pre: md5" ); -MODULE_SOFTDEP ("pre: nls" ); -MODULE_SOFTDEP ("pre: aes" ); -MODULE_SOFTDEP ("pre: cmac" ); -MODULE_SOFTDEP ("pre: sha256" ); -MODULE_SOFTDEP ("pre: sha512" ); -MODULE_SOFTDEP ("pre: aead2" ); -MODULE_SOFTDEP ("pre: ccm" ); -MODULE_SOFTDEP ("pre: gcm" ); +MODULE_SOFTDEP ("ecb" ); +MODULE_SOFTDEP ("hmac" ); +MODULE_SOFTDEP ("md4" ); +MODULE_SOFTDEP ("md5" ); +MODULE_SOFTDEP ("nls" ); +MODULE_SOFTDEP ("aes" ); +MODULE_SOFTDEP ("cmac" ); +MODULE_SOFTDEP ("sha256" ); +MODULE_SOFTDEP ("sha512" ); +MODULE_SOFTDEP ("aead2" ); +MODULE_SOFTDEP ("ccm" ); +MODULE_SOFTDEP ("gcm" );module_init (init_cifs)module_exit (exit_cifs) --2.13.6
Signature · 3 lines
Thanks, Steve