Date: Sun, 6 Feb 2011 23:41:10 -0500 From: Rich <rincebrain@gmail.com> To: Anonymous <swell.k@gmail.com> Cc: Olivier Smedts <olivier@gid0.org>, FreeBSD-current <freebsd-current@freebsd.org>, Shawn Webb <lattera@gmail.com> Subject: Re: zpool v28 and -current Message-ID: <AANLkTi=Do7ym4yqCUWZA2XPt=hzBDsYTW0PeA=6pD1c0@mail.gmail.com> In-Reply-To: <86oc6ov9lh.fsf@gmail.com> References: <AANLkTikM0S3aovnk0WQikC%2BC130DW7M4Nv6kDp%2BRCfGj@mail.gmail.com> <86k4hkiyr1.fsf@gmail.com> <AANLkTikAhuaeo3Z1O28ihBucafyJnpPiriwqs9v9Hsrv@mail.gmail.com> <86wrljuce6.fsf@gmail.com> <AANLkTimoP=AKTk-70BTzSQDbr-XqqSTLrE=y9=0ndsPR@mail.gmail.com> <AANLkTin0OxaHcdzE8EF6t-%2BkeLjbsXKOMnsA9WdGdrTg@mail.gmail.com> <86oc6ov9lh.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Feb 6, 2011 at 9:53 PM, Anonymous <swell.k@gmail.com> wrote: > Rich <rincebrain@gmail.com> writes: > > >> Attempted this procedure today, make fails with: > [...] > >> > /usr/local/ncvs/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:188: > >> error: 'zfs_mdcomp_disable' undeclared here (not in a function) > > > > First error is just a variable undefined that was defined in the original > > file pre-patching in the function; redefined it as defined in the > original. > > No, it should be removed from there. See if you have arc.c.rej. > I do; as soon as I get to the machine in question, I'll quote it for you. > %% > @@ -186,14 +185,11 @@ > TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max); > TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min); > TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit); > -TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable); > SYSCTL_DECL(_vfs_zfs); > SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0, > "Maximum ARC size"); > SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0, > "Minimum ARC size"); > -SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN, > - &zfs_mdcomp_disable, 0, "Disable metadata compression"); > > /* > * Note that buffers can be in one of 6 states: > %% > > >> > /usr/local/ncvs/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:3580: > >> warning: passing argument 7 of 'zio_write' discards qualifiers from > pointer target type > > > > Second error is because arc_write takes a const of that property now, and > > zio_write still doesn't, resulting in the warning as shown. Dunno what > the > > correct way to fix this is, as it's unclear to me why the change was > done. > > Did you count wrong? The 7th argument to zio_write() around 3580 line is > `&zp' vs. `zp'. > In my copy of said file, zp is defined in the signature of arc_write as const, which is where the error comes from. - Rich
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTi=Do7ym4yqCUWZA2XPt=hzBDsYTW0PeA=6pD1c0>