git: e152bbecb221 - main - param.h: bump __FreeBSD_version for commit 7763814fc9c2

Konstantin Belousov kostikbel at gmail.com
Tue Apr 13 12:00:30 UTC 2021


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 at FreeBSD.org>
> AuthorDate: 2021-04-11 21:47:36 +0000
> Commit:     Rick Macklem <rmacklem at 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 at 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


More information about the dev-commits-src-all mailing list