Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Apr 2021 15:00:20 +0300
From:      Konstantin Belousov <kostikbel@gmail.com>
To:        Rick Macklem <rmacklem@freebsd.org>
Cc:        src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject:   Re: git: e152bbecb221 - main - param.h: bump __FreeBSD_version for commit 7763814fc9c2
Message-ID:  <YHWH1DQV/mT4TfYV@kib.kiev.ua>
In-Reply-To: <202104112153.13BLrZ6B079911@gitrepo.freebsd.org>
References:  <202104112153.13BLrZ6B079911@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Apr 11, 2021 at 09:53:35PM +0000, Rick Macklem wrote:
> The branch main has been updated by rmacklem:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=e152bbecb221a592e7dbcabe3d1170a60f0d0dfe
> 
> commit e152bbecb221a592e7dbcabe3d1170a60f0d0dfe
> Author:     Rick Macklem <rmacklem@FreeBSD.org>
> AuthorDate: 2021-04-11 21:47:36 +0000
> Commit:     Rick Macklem <rmacklem@FreeBSD.org>
> CommitDate: 2021-04-11 21:50:56 +0000
> 
>     param.h: bump __FreeBSD_version for commit 7763814fc9c2
>     
>     Commit 7763814fc9c2 changed the internal KAPI between the krpc
>     and NFS.  As such, the krpc, nfscommon and nfscl modules must
>     all be rebuilt from sources.

In fact this commit introduced the dependency between xdr.ko and nfscl.ko.
Do you have an objections against the following?

commit 717018345b07939cde2db5c6be040cd9de3314cf
Author: Konstantin Belousov <kib@FreeBSD.org>
Date:   Tue Apr 13 14:47:20 2021 +0300

    nfs client: depend on xdr
    
    Since 7763814fc9c27 nfsrpc_setclient() uses mem_alloc() that is macro
    around malloc(M_RPC).  M_RPC is provided by xdr.ko.

diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index 365b1c387cc2..08a25c6fe632 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -155,6 +155,7 @@ MODULE_VERSION(nfs, 1);
 MODULE_DEPEND(nfs, nfscommon, 1, 1, 1);
 MODULE_DEPEND(nfs, krpc, 1, 1, 1);
 MODULE_DEPEND(nfs, nfssvc, 1, 1, 1);
+MODULE_DEPEND(nfs, xdr, 1, 1, 1);
 
 /*
  * This structure is now defined in sys/nfs/nfs_diskless.c so that it



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YHWH1DQV/mT4TfYV>