Date: Sun, 25 Sep 2016 21:34:26 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422756 - head/devel/libgtop/files Message-ID: <201609252134.u8PLYQr8017397@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun Sep 25 21:34:26 2016 New Revision: 422756 URL: https://svnweb.freebsd.org/changeset/ports/422756 Log: Fix the build after 305902 change ufs inode related structs. https://svnweb.freebsd.org/changeset/base/305902 Submitted by: antoine@ Added: head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c (contents, props changed) Added: head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c Sun Sep 25 21:34:26 2016 (r422756) @@ -0,0 +1,31 @@ +--- sysdeps/freebsd/procmap.c.orig 2015-08-17 18:59:37 UTC ++++ sysdeps/freebsd/procmap.c +@@ -52,6 +52,8 @@ + #include <sys/mount.h> + #include <ufs/ufs/quota.h> + #include <ufs/ufs/inode.h> ++#include <ufs/ufs/extattr.h> ++#include <ufs/ufs/ufsmount.h> + #include <fs/devfs/devfs.h> + #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__) + #include <fs/devfs/devfs_int.h> +@@ -86,6 +88,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glib + struct cdev_priv priv; + #if __FreeBSD_version < 800039 + struct cdev si; ++#else ++ struct ufsmount um; + #endif + + *inum = 0; +@@ -167,7 +171,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib + + + #if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) +- if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, ++ if (kvm_read (server->machine->kd, (gulong) inode.i_ump, (char *) &um, ++ sizeof (um)) != sizeof (um) || ++ kvm_read (server->machine->kd, (gulong) cdev2priv(um.um_dev), (char *) &priv, + sizeof (priv)) + #else + if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609252134.u8PLYQr8017397>