Linux-CIFS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] cifs: don't use 'pre:' for MODULE_SOFTDEP
@ 2019-10-31  3:55 Ronnie Sahlberg
  2019-11-03  2:04 ` Steve French
  0 siblings, 1 reply; 2+ messages in thread
From: Ronnie Sahlberg @ 2019-10-31  3:55 UTC (permalink / raw)
  To: linux-cifs; +Cc: Ronnie Sahlberg

It can cause
to fail with
modprobe: FATAL: Module <module> is builtin.

RHBZ: 1767094

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] cifs: don't use 'pre:' for MODULE_SOFTDEP
  2019-10-31  3:55 [PATCH] cifs: don't use 'pre:' for MODULE_SOFTDEP Ronnie Sahlberg
@ 2019-11-03  2:04 ` Steve French
  0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2019-11-03  2:04 UTC (permalink / raw)
  To: Ronnie Sahlberg; +Cc: linux-cifs, linux-fsdevel

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@redhat.com> wrote:
>
> It can cause
> to fail with
> modprobe: FATAL: Module <module> is builtin.
>
> RHBZ: 1767094
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
>  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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-31  3:55 [PATCH] cifs: don't use 'pre:' for MODULE_SOFTDEP Ronnie Sahlberg
2019-11-03  2:04 ` Steve French

Linux-CIFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-cifs/0 linux-cifs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-cifs linux-cifs/ https://lore.kernel.org/linux-cifs \
		linux-cifs@vger.kernel.org
	public-inbox-index linux-cifs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-cifs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git