Tentatively merged into cifs-2.6.git for-next but am curious about the
similar problem with ext4 and btrfs
On Wed, Oct 30, 2019 at 10:59 PM Ronnie Sahlberg <lsahlber@xxxxxxxxxx> wrote:
>
> It can cause
> to fail with
> modprobe: FATAL: Module <module> is builtin.
>
> RHBZ: 1767094
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@xxxxxxxxxx>
> ---
> fs/cifs/cifsfs.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index f8e201c45ccb..a578699ce63c 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -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
>
--
Thanks,
Steve
