42 lines
1.2 KiB
Plaintext
42 lines
1.2 KiB
Plaintext
$NetBSD: patch-ab,v 1.6 2016/09/01 12:58:46 mef Exp $
|
|
|
|
--- nfs/syscalls.c.orig 2003-12-29 20:11:57.000000000 +0900
|
|
+++ nfs/syscalls.c 2016-09-01 21:47:55.000000000 +0900
|
|
@@ -19,6 +19,9 @@
|
|
#include <arpa/inet.h>
|
|
#ifdef __NetBSD__
|
|
#include <nfs/nfsmount.h>
|
|
+#if __NetBSD_Version__ >= 299000900
|
|
+#define statfs statvfs
|
|
+#endif
|
|
#endif
|
|
#include "my_defines.h"
|
|
|
|
@@ -68,7 +71,7 @@ int syscall_mount(char *dir, void *root_
|
|
struct sockaddr_in *socket, char *mntfrom)
|
|
{
|
|
struct nfs_args nfs_args;
|
|
-#ifdef __FreeBSD__
|
|
+#if defined(__FreeBSD__) || defined(__DragonFly__)
|
|
# ifdef _NEW_VFSCONF
|
|
struct vfsconf vfc;
|
|
int error;
|
|
@@ -99,7 +102,7 @@ struct nfs_args nfs_args;
|
|
#else
|
|
# define NFSNAME MOUNT_NFS
|
|
#endif
|
|
-#ifdef __FreeBSD__
|
|
+#if defined(__FreeBSD__) || defined(__DragonFly__)
|
|
# ifdef _NEW_VFSCONF
|
|
# define GETVFSBYNAME error = getvfsbyname("nfs", &vfc)
|
|
# define VFCERROR error
|
|
@@ -119,6 +122,8 @@ struct nfs_args nfs_args;
|
|
if (VFCERROR)
|
|
return -1;
|
|
return mount(VFCNFSNAME, dir, 0, &nfs_args);
|
|
+#elif defined(__NetBSD__) && __NetBSD_Version__ >=499002400
|
|
+ return mount(NFSNAME, dir, 0, &nfs_args, sizeof(nfs_args));
|
|
#else /* __FreeBSD__ */
|
|
return mount(NFSNAME, dir, 0, &nfs_args);
|
|
#endif /* __FreeBSD__ */
|